diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2009-10-09 00:42:36 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2009-10-09 00:42:36 +0000 |
| commit | 81e0fb43caa27491fa18b17d6a05cafb0e20dfa6 (patch) | |
| tree | aea6b59f47a56255ab01c0b814650b943170847e /indra/newview/llviewerwindow.cpp | |
| parent | 4c89e7389383e2943334ad8ec185b8935cbe7db8 (diff) | |
merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1943 https://svn.aws.productengine.com/secondlife/pe/stable-2@1958 -> viewer-2.0.0-3
* Bugs: EXT-1148 EXT-1330 EXT-990 EXT-1259 EXT-1184 EXT-1327 EXT-1389 EXT-1276 EXT-1390 EXT-1396 EXT-1050 EXT-1094 EXT-1166 EXT-1137 EXT-1327 EXT-782 EXT-1137 EXT-1394 EXT-1326 EXT-917 EXT-1262
* New Dev: EXT-1292 EXT-1139
Diffstat (limited to 'indra/newview/llviewerwindow.cpp')
| -rw-r--r-- | indra/newview/llviewerwindow.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp index 22141011a2..fc6467ea23 100644 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -1467,6 +1467,7 @@ void LLViewerWindow::initBase() hvp.rect(full_window); hvp.follows.flags(FOLLOWS_ALL); gToolTipView = LLUICtrlFactory::create<LLToolTipView>(hvp); + gToolTipView->setFollowsAll(); getRootView()->addChild(gToolTipView); // Add the progress bar view (startup view), which overrides everything @@ -1569,6 +1570,11 @@ void LLViewerWindow::initWorldUI() LLBottomTray::getInstance()->showCameraButton(FALSE); } + if (!gSavedSettings.getBOOL("ShowSnapshotButton")) + { + LLBottomTray::getInstance()->showSnapshotButton(FALSE); + } + if (!gSavedSettings.getBOOL("ShowMoveButton")) { LLBottomTray::getInstance()->showMoveButton(FALSE); |