diff options
| author | Seth ProductEngine <slitovchuk@productengine.com> | 2011-10-14 01:07:16 +0300 |
|---|---|---|
| committer | Seth ProductEngine <slitovchuk@productengine.com> | 2011-10-14 01:07:16 +0300 |
| commit | bdf6363e6aa4216913607e83bfc5e159f2535407 (patch) | |
| tree | 8b7939aea641f2ea28689a7f8a4830c1b6817b55 /indra/newview/llviewermenu.cpp | |
| parent | 9273459251a6c59f8fabc50d9eef0b78e092e6fd (diff) | |
EXP-1282 FIXED Bottom bar removed.
- LLBottomTray code and XUI removed.
- "Speak" buttom which resided in Bottom bar removed.
- Voice connection status update moved from LLBottomTray to LLVivoxVoiceClient.
Diffstat (limited to 'indra/newview/llviewermenu.cpp')
| -rw-r--r-- | indra/newview/llviewermenu.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index 5d215c7f6d..6ce0c358a1 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -42,7 +42,6 @@ #include "llagentcamera.h" #include "llagentwearables.h" #include "llagentpilot.h" -#include "llbottomtray.h" #include "llcompilequeue.h" #include "llconsole.h" #include "lldaycyclemanager.h" @@ -7795,7 +7794,7 @@ class LLWorldToggleMovementControls : public view_listener_t { bool handleEvent(const LLSD& userdata) { - LLBottomTray::getInstance()->toggleMovementControls(); + LLFloaterReg::toggleInstanceOrBringToFront("moveview"); return true; } }; @@ -7804,7 +7803,7 @@ class LLWorldToggleCameraControls : public view_listener_t { bool handleEvent(const LLSD& userdata) { - LLBottomTray::getInstance()->toggleCameraControls(); + LLFloaterReg::toggleInstanceOrBringToFront("camera"); return true; } }; |