diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2009-08-05 16:10:15 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2009-08-05 16:10:15 -0400 |
| commit | 07129bf928f79246849e66b396fab44a7a228216 (patch) | |
| tree | e4e19b342540450ff84dad75f90d5acb5b3d6269 /indra/newview/llviewergesture.cpp | |
| parent | 03ebc43132331b9a8dcb3c418ec9c319a6beddda (diff) | |
| parent | dc62495da6e5c153c0df57fdbce6b0f40c0208f2 (diff) | |
Merge recent changes
Diffstat (limited to 'indra/newview/llviewergesture.cpp')
| -rw-r--r-- | indra/newview/llviewergesture.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/indra/newview/llviewergesture.cpp b/indra/newview/llviewergesture.cpp index 2fb56fbcb8..4155a87e14 100644 --- a/indra/newview/llviewergesture.cpp +++ b/indra/newview/llviewergesture.cpp @@ -39,7 +39,6 @@ #include "llviewerinventory.h" #include "sound_ids.h" // for testing -#include "llchatbar.h" #include "llkeyboard.h" // for key shortcuts for testing #include "llinventorymodel.h" #include "llvoavatar.h" @@ -47,7 +46,7 @@ #include "llviewermessage.h" // send_guid_sound_trigger #include "llviewernetwork.h" #include "llagent.h" -#include "llbottomtray.h" +#include "llnearbychatbar.h" // Globals LLViewerGestureList gGestureList; @@ -133,11 +132,11 @@ void LLViewerGesture::doTrigger( BOOL send_chat ) } } - if ( send_chat && !mOutputString.empty()) + if (send_chat && !mOutputString.empty()) { // Don't play nodding animation, since that might not blend // with the gesture animation. - LLBottomTray::getInstance()->sendChatFromViewer(mOutputString, CHAT_TYPE_NORMAL, FALSE); + LLNearbyChatBar::getInstance()->sendChatFromViewer(mOutputString, CHAT_TYPE_NORMAL, FALSE); } } |