summaryrefslogtreecommitdiff
path: root/indra/newview/llagentcamera.cpp
diff options
context:
space:
mode:
authorRichard Nelson <richard@lindenlab.com>2011-10-14 13:10:02 -0700
committerRichard Nelson <richard@lindenlab.com>2011-10-14 13:10:02 -0700
commit0d215ba34fa479bd1a9c0b589c2f1e42448dfe63 (patch)
tree100daf51282033945b449b73e3bb87bcc808e66b /indra/newview/llagentcamera.cpp
parent1d53e59befeea6547567b9f6e3c254846048250c (diff)
EXP-1323 FIX Mouselook text "Press ESC to return to World View" overlaps with bottom toolbar if mode is icon only
made mouselook work when hiding ui by unhiding UI first
Diffstat (limited to 'indra/newview/llagentcamera.cpp')
-rw-r--r--indra/newview/llagentcamera.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/newview/llagentcamera.cpp b/indra/newview/llagentcamera.cpp
index 27e9aa32f2..751b73e1eb 100644
--- a/indra/newview/llagentcamera.cpp
+++ b/indra/newview/llagentcamera.cpp
@@ -2041,12 +2041,11 @@ void LLAgentCamera::resetCamera()
void LLAgentCamera::changeCameraToMouselook(BOOL animate)
{
if (!gSavedSettings.getBOOL("EnableMouselook")
- || LLViewerJoystick::getInstance()->getOverrideCamera()
- || !gViewerWindow->getUIVisibility())
+ || LLViewerJoystick::getInstance()->getOverrideCamera())
{
return;
}
-
+
// visibility changes at end of animation
gViewerWindow->getWindow()->resetBusyCount();