From e310350a2c45f5011d6f2125dccdd502f34716c5 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Tue, 23 Mar 2010 15:38:51 -0700
Subject: EXT-6404 - [TRANSPARENT MENU IN EN] Snapshot floater, all pull-down
 menus become transparent

reviewed by Leyla
---
 indra/newview/llviewerwindow.cpp                 |  4 ++--
 indra/newview/skins/default/xui/en/main_view.xml | 28 +++++++++++++++---------
 2 files changed, 20 insertions(+), 12 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp
index e7d64c48a0..d91833fd22 100644
--- a/indra/newview/llviewerwindow.cpp
+++ b/indra/newview/llviewerwindow.cpp
@@ -1608,8 +1608,8 @@ void LLViewerWindow::initWorldUI()
 
 	gIMMgr = LLIMMgr::getInstance();
 
-	getRootView()->sendChildToFront(gFloaterView);
-	getRootView()->sendChildToFront(gSnapshotFloaterView);
+	//getRootView()->sendChildToFront(gFloaterView);
+	//getRootView()->sendChildToFront(gSnapshotFloaterView);
 
 	// new bottom panel
 	LLPanel* bottom_tray_container = getRootView()->getChild<LLPanel>("bottom_tray_container");
diff --git a/indra/newview/skins/default/xui/en/main_view.xml b/indra/newview/skins/default/xui/en/main_view.xml
index 1ace760816..e8f9d65be5 100644
--- a/indra/newview/skins/default/xui/en/main_view.xml
+++ b/indra/newview/skins/default/xui/en/main_view.xml
@@ -172,6 +172,24 @@
          class="progress_view"
          width="1024"
          visible="false"/>
+  <panel top="0"
+        follows="all"
+        mouse_opaque="false"
+        left="0"
+        name="snapshot_floater_view_holder" 
+        width="1024"
+        height="798">
+    <snapshot_floater_view enabled="false"
+                           follows="all"
+                           height="768"
+                           left="0"
+                           mouse_opaque="false"
+                           name="Snapshot Floater View"
+                           tab_stop="false"
+                           top="0"
+                           visible="false"
+                           width="1024"/>
+  </panel>
   <panel top="0"
          follows="all"
          height="768"
@@ -185,16 +203,6 @@
                mouse_opaque="false"
                name="Menu Holder"
                width="1024"/>
-  <snapshot_floater_view enabled="false"
-                         follows="all"
-                         height="768"
-                         left="0"
-                         mouse_opaque="false"
-                         name="Snapshot Floater View"
-                         tab_stop="false"
-                         top="0"
-                         visible="false"
-                         width="1024"/>
   <tooltip_view top="0"
                 follows="all"
                 height="768"
-- 
cgit v1.2.3