From 72a259e9fb240fa7bc28c7eb02f954e28d573f0e Mon Sep 17 00:00:00 2001
From: "gavin%gavinsharp.com"
 <gavin%gavinsharp.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Mon, 27 Nov 2006 20:06:45 +0000
Subject: [PATCH] Bug 361105: Failed to load overlay from
 chrome://communicator/content..., patch by Shawn Wilsher :sdwilsh
 <comrade693+bmo@gmail.com>, r=db48x, sr=neil

git-svn-id: svn://10.0.0.236/trunk@215896 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/extensions/inspector/jar.mn                         | 2 ++
 mozilla/extensions/inspector/resources/content/contents.rdf | 6 ++++++
 .../extensions/inspector/resources/content/inspector.xul    | 3 +--
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/mozilla/extensions/inspector/jar.mn b/mozilla/extensions/inspector/jar.mn
index be25e9cc5e2..6749196fd4a 100644
--- a/mozilla/extensions/inspector/jar.mn
+++ b/mozilla/extensions/inspector/jar.mn
@@ -1,5 +1,7 @@
 inspector.jar:
 % content inspector %content/inspector/ xpcnativewrappers=no
+% overlay chrome://inspector/content/inspector.xul chrome://communicator/content/utilityOverlay.xul application={92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}
+% overlay chrome://inspector/content/inspector.xul chrome://communicator/content/tasksOverlay.xul application={92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}
 % overlay chrome://communicator/content/tasksOverlay.xul chrome://inspector/content/tasksOverlay.xul application={92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}
 % overlay chrome://communicator/content/pref/preftree.xul chrome://inspector/content/prefs/prefsOverlay.xul application={92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}
 % overlay chrome://browser/content/browser.xul chrome://inspector/content/tasksOverlay-ff.xul application={ec8030f7-c20a-464f-9b0e-13a3a9e97384}
diff --git a/mozilla/extensions/inspector/resources/content/contents.rdf b/mozilla/extensions/inspector/resources/content/contents.rdf
index 85b20ce49f0..7efe373a9cd 100644
--- a/mozilla/extensions/inspector/resources/content/contents.rdf
+++ b/mozilla/extensions/inspector/resources/content/contents.rdf
@@ -20,6 +20,7 @@
   <RDF:Seq about="urn:mozilla:overlays">
     <RDF:li resource="chrome://communicator/content/tasksOverlay.xul"/>
     <RDF:li resource="chrome://communicator/content/pref/preftree.xul"/>
+    <RDF:li resource="chrome://inspector/content/inspector.xul"/>
     <RDF:li resource="chrome://inspector/content/commandOverlay.xul"/>
     <RDF:li resource="chrome://inspector/content/keysetOverlay.xul"/>
     <RDF:li resource="chrome://inspector/content/popupOverlay.xul"/>
@@ -37,6 +38,11 @@
 
   <!-- Inspector Overlays -->
 
+  <RDF:Seq about="chrome://inspector/content/inspector.xul">
+    <RDF:li>chrome://communicator/content/utilityOverlay.xul</RDF:li>
+    <RDF:li>chrome://communicator/content/tasksOverlay.xul</RDF:li>
+  </RDF:Seq>
+
   <RDF:Seq about="chrome://inspector/content/commandOverlay.xul">
     <RDF:li>chrome://inspector/content/viewers/dom/commandOverlay.xul</RDF:li>
     <RDF:li>chrome://inspector/content/viewers/styleRules/commandOverlay.xul</RDF:li>
diff --git a/mozilla/extensions/inspector/resources/content/inspector.xul b/mozilla/extensions/inspector/resources/content/inspector.xul
index 8d93b13ac7c..e27ea849232 100644
--- a/mozilla/extensions/inspector/resources/content/inspector.xul
+++ b/mozilla/extensions/inspector/resources/content/inspector.xul
@@ -20,6 +20,7 @@
    - the Initial Developer. All Rights Reserved.
    -
    - Contributor(s):
+   -   Shawn Wilsher <me@shawnwilsher.com>
    -
    - Alternatively, the contents of this file may be used under the terms of
    - either the GNU General Public License Version 2 or later (the "GPL"), or
@@ -50,8 +51,6 @@
 <?xul-overlay href="chrome://inspector/content/statusbarOverlay.xul"?>
 
 <?xul-overlay href="chrome://global/content/globalOverlay.xul"?>
-<?xul-overlay href="chrome://communicator/content/utilityOverlay.xul"?>
-<?xul-overlay href="chrome://communicator/content/tasksOverlay.xul"?>
 
 <?xml-stylesheet href="chrome://inspector/skin/inspectorWindow.css"?>