diff options
| author | James Cook <james@lindenlab.com> | 2010-01-05 16:29:11 -0800 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2010-01-05 16:29:11 -0800 |
| commit | 8a033dba8dd77a6f4c4bdeaa6b897101ccb26472 (patch) | |
| tree | 4fb1f9ffba3b224c79d2e9d263a9b010c3d3eadf /indra/newview/llviewermenu.cpp | |
| parent | a3adfe54cb9fc953cae0adf2f61c578aa3ca5842 (diff) | |
| parent | ab3dbd647e78cff67ce7ffe85bb6fbc5c5461312 (diff) | |
Merge
Diffstat (limited to 'indra/newview/llviewermenu.cpp')
| -rw-r--r-- | indra/newview/llviewermenu.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index fb64a1929d..149b7a6d65 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -62,6 +62,7 @@ #include "llfloaterreporter.h" #include "llfloatersearch.h" #include "llfloaterscriptdebug.h" +#include "llfloatersnapshot.h" #include "llfloatertools.h" #include "llfloaterworldmap.h" #include "llavataractions.h" @@ -446,6 +447,8 @@ void init_menus() // Otherwise tool tips for menu items would be overlapped by menu, since // main view is behind of menu holder now. gViewerWindow->getRootView()->addChild(gToolTipView); + + gViewerWindow->getRootView()->addChild(gSnapshotFloaterView); gViewerWindow->setMenuBackgroundColor(false, LLViewerLogin::getInstance()->isInProductionGrid()); |