diff options
| author | Richard Linden <none@none> | 2010-03-23 15:39:18 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2010-03-23 15:39:18 -0700 |
| commit | 85c1b3f74aeaa342124fd24e888c93abd34c9df9 (patch) | |
| tree | 30bca938c6947a7c02a29f19bb400d6a4049268d /indra | |
| parent | ed8fa8ab3b05e91f967e6ccb4d5428e799f8f262 (diff) | |
| parent | e310350a2c45f5011d6f2125dccdd502f34716c5 (diff) | |
merge
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llviewerwindow.cpp | 4 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/main_view.xml | 28 |
2 files changed, 20 insertions, 12 deletions
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 @@ -173,6 +173,24 @@ 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" mouse_opaque="false" @@ -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" |