diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-03-24 10:31:19 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-03-24 10:31:19 +0000 |
| commit | 6f77f8891a7b0e95e1ea946b48dcac93dc68fa1a (patch) | |
| tree | b22e29c4ebc608de4813d4a6518447b2d7b64f10 /indra/newview/llviewerwindow.cpp | |
| parent | ebea9eed4d30376e8914c0e778250ecc45f9dd22 (diff) | |
| parent | 00a97a4f95f644b1807d72cebce6dd6a7a1cf31e (diff) | |
viewer2 merge
Diffstat (limited to 'indra/newview/llviewerwindow.cpp')
| -rw-r--r-- | indra/newview/llviewerwindow.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp index a0903d671e..d7f7436077 100644 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -1652,8 +1652,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"); |