diff options
| author | Mike Antipov <mantipov@productengine.com> | 2010-03-24 09:17:08 +0200 |
|---|---|---|
| committer | Mike Antipov <mantipov@productengine.com> | 2010-03-24 09:17:08 +0200 |
| commit | 07de4edbc45de93c04bc4d0a7c174a45c902b50f (patch) | |
| tree | 14d90da452bb109e6f94567f057fac5f41ef0cf0 /indra/newview/llviewerwindow.cpp | |
| parent | 2edbd733843d5ad0f9ec3dec49e676651bda07af (diff) | |
| parent | 00a97a4f95f644b1807d72cebce6dd6a7a1cf31e (diff) | |
Merge from default branch
--HG--
branch : product-engine
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"); |