summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llagentcamera.cpp5
-rw-r--r--indra/newview/llviewermenu.cpp1
2 files changed, 3 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();
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index 3dd5d26b6d..cfbe32a871 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -6896,6 +6896,7 @@ class LLToggleHowTo : public view_listener_t
p.url = gSavedSettings.getString("HowToHelpURL");
p.show_chrome = false;
p.target = "__help_how_to";
+ p.show_page_title = false;
LLFloaterReg::toggleInstanceOrBringToFront("how_to", p);
return true;