summaryrefslogtreecommitdiff
path: root/indra/newview/llbottomtray.cpp
diff options
context:
space:
mode:
authorMatthew Breindel (Falcon) <falcon@lindenlab.com>2010-04-01 11:32:50 -0700
committerMatthew Breindel (Falcon) <falcon@lindenlab.com>2010-04-01 11:32:50 -0700
commit07ff392e8d12214dc23884a092204f00386109a9 (patch)
treea23e03269da7d99e9882531750d7c17e3e3db868 /indra/newview/llbottomtray.cpp
parent19c83c67c42305e41bff4b651975671d34a22b55 (diff)
parentbb4836f53d98d987a1702f970d4b853eaa529907 (diff)
Merge
Diffstat (limited to 'indra/newview/llbottomtray.cpp')
-rw-r--r--indra/newview/llbottomtray.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llbottomtray.cpp b/indra/newview/llbottomtray.cpp
index b88be53d79..34cb6fd2eb 100644
--- a/indra/newview/llbottomtray.cpp
+++ b/indra/newview/llbottomtray.cpp
@@ -35,7 +35,7 @@
#define LLBOTTOMTRAY_CPP
#include "llbottomtray.h"
-#include "llagent.h"
+#include "llagentcamera.h"
#include "llchiclet.h"
#include "llfloaterreg.h"
#include "llflyoutbutton.h"
@@ -125,7 +125,7 @@ public:
void onFocusLost()
{
- if (gAgent.cameraMouselook())
+ if (gAgentCamera.cameraMouselook())
{
LLBottomTray::getInstance()->setVisible(FALSE);
}