diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-03-24 10:32:38 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-03-24 10:32:38 +0000 |
| commit | 7857f59f9e7c673f1ddbf32d6a66e85f78004445 (patch) | |
| tree | f9831059bcadfc8be4fc5cd09673dfa419fa9b63 /indra/newview/llviewerwindow.cpp | |
| parent | e7d9999359dd62509c685181d620b092ed28bc60 (diff) | |
| parent | 00a97a4f95f644b1807d72cebce6dd6a7a1cf31e (diff) | |
merge from viewer-2-0
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 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"); |