summaryrefslogtreecommitdiff
path: root/indra/newview/llagent.cpp
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2011-10-14 16:49:11 -0700
committerMerov Linden <merov@lindenlab.com>2011-10-14 16:49:11 -0700
commitfc2bd1cce2e6c213fa682b9768d435a4e394a95e (patch)
treedba1adbac8c96a093a0dfd5f54b7eccd65bf2233 /indra/newview/llagent.cpp
parent4c6f04c50225a4a5494974c3a6e13bee76cfbb6f (diff)
parentcf98cdf69f481dd473363d4a80a80f27e96f87e8 (diff)
Pull from richard/viewer-experience-fui
Diffstat (limited to 'indra/newview/llagent.cpp')
-rwxr-xr-xindra/newview/llagent.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp
index 5fc95f123a..773e20eda7 100755
--- a/indra/newview/llagent.cpp
+++ b/indra/newview/llagent.cpp
@@ -36,10 +36,10 @@
#include "llagentwearables.h"
#include "llagentui.h"
#include "llanimationstates.h"
-#include "llbottomtray.h"
#include "llcallingcard.h"
#include "llcapabilitylistener.h"
#include "llchannelmanager.h"
+#include "llchicletbar.h"
#include "llconsole.h"
#include "llenvmanager.h"
#include "llfirstuse.h"
@@ -1876,7 +1876,7 @@ void LLAgent::endAnimationUpdateUI()
LLPanelTopInfoBar::getInstance()->setVisible(TRUE);
}
- LLBottomTray::getInstance()->onMouselookModeOut();
+ LLChicletBar::getInstance()->setVisible(TRUE);
LLPanelStandStopFlying::getInstance()->setVisible(TRUE);
@@ -1985,7 +1985,7 @@ void LLAgent::endAnimationUpdateUI()
LLPanelTopInfoBar::getInstance()->setVisible(FALSE);
- LLBottomTray::getInstance()->onMouselookModeIn();
+ LLChicletBar::getInstance()->setVisible(FALSE);
LLPanelStandStopFlying::getInstance()->setVisible(FALSE);