diff options
| author | Palmer <palmer@lindenlab.com> | 2009-08-06 14:51:11 -0700 |
|---|---|---|
| committer | Palmer <palmer@lindenlab.com> | 2009-08-06 14:51:11 -0700 |
| commit | b2632c50efc12eacdcadace64e6c0f1906b86ff6 (patch) | |
| tree | c32d7e9b29e37d5c30ac16dfac55733456d7eee0 /indra/newview/lloverlaybar.cpp | |
| parent | 27cf39cdbf27fe52dcf9c70cfdadcc18ddf2e75c (diff) | |
| parent | a8d216e194327c7bee8a42c983f7f2ca01adb385 (diff) | |
Merge of my DEV-36732 work and all the main line login api work that went on.
Diffstat (limited to 'indra/newview/lloverlaybar.cpp')
| -rw-r--r-- | indra/newview/lloverlaybar.cpp | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/indra/newview/lloverlaybar.cpp b/indra/newview/lloverlaybar.cpp index 2ccd729e0a..0eb96f992a 100644 --- a/indra/newview/lloverlaybar.cpp +++ b/indra/newview/lloverlaybar.cpp @@ -41,7 +41,6 @@ #include "llrender.h" #include "llagent.h" #include "llbutton.h" -#include "llchatbar.h" #include "llfocusmgr.h" #include "llimview.h" #include "llmediaremotectrl.h" @@ -49,7 +48,7 @@ #include "lltextbox.h" #include "llui.h" #include "llviewercontrol.h" -#include "llviewerimagelist.h" +#include "llviewertexturelist.h" #include "llviewerjoystick.h" #include "llviewermedia.h" #include "llviewermenu.h" // handle_reset_view() @@ -92,12 +91,6 @@ void* LLOverlayBar::createVoiceRemote(void* userdata) return self->mVoiceRemote; } -void* LLOverlayBar::createChatBar(void* userdata) -{ - gChatBar = new LLChatBar(); - return gChatBar; -} - LLOverlayBar::LLOverlayBar() : LLPanel(), mMediaRemote(NULL), @@ -111,7 +104,6 @@ LLOverlayBar::LLOverlayBar() mFactoryMap["media_remote"] = LLCallbackMap(LLOverlayBar::createMediaRemote, this); mFactoryMap["voice_remote"] = LLCallbackMap(LLOverlayBar::createVoiceRemote, this); - mFactoryMap["chat_bar"] = LLCallbackMap(LLOverlayBar::createChatBar, this); LLUICtrlFactory::getInstance()->buildPanel(this, "panel_overlaybar.xml"); } @@ -239,7 +231,7 @@ void LLOverlayBar::refresh() BOOL sitting = FALSE; if (gAgent.getAvatarObject()) { - sitting = gAgent.getAvatarObject()->mIsSitting; + sitting = gAgent.getAvatarObject()->isSitting(); } button = getChild<LLButton>("Stand Up"); |