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/llbottomtray.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/llbottomtray.cpp')
| -rw-r--r-- | indra/newview/llbottomtray.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/indra/newview/llbottomtray.cpp b/indra/newview/llbottomtray.cpp index 8771611b1c..0ff8ca7d26 100644 --- a/indra/newview/llbottomtray.cpp +++ b/indra/newview/llbottomtray.cpp @@ -87,6 +87,7 @@ BOOL LLBottomTray::postBuild() mMovementPanel = getChild<LLPanel>("movement_panel"); mGestureCombo = getChild<LLComboBox>("Gesture"); mCamPanel = getChild<LLPanel>("cam_panel"); + mSnapshotPanel = getChild<LLPanel>("snapshot_panel"); setRightMouseDownCallback(boost::bind(&LLBottomTray::showBottomTrayContextMenu,this, _2, _3,_4)); return TRUE; @@ -212,7 +213,7 @@ void LLBottomTray::setVisible(BOOL visible) LLView* viewp = *child_it; std::string name = viewp->getName(); - if ("chat_bar" == name || "movement_panel" == name || "cam_panel" == name) + if ("chat_bar" == name || "movement_panel" == name || "cam_panel" == name || "snapshot_panel" == name) continue; else { @@ -266,3 +267,8 @@ void LLBottomTray::showCameraButton(BOOL visible) { mCamPanel->setVisible(visible); } + +void LLBottomTray::showSnapshotButton(BOOL visible) +{ + mSnapshotPanel->setVisible(visible); +} |