diff options
| author | prep <prep@lindenlab.com> | 2013-03-11 15:05:47 -0400 |
|---|---|---|
| committer | prep <prep@lindenlab.com> | 2013-03-11 15:05:47 -0400 |
| commit | e0c9174609e2457fab7fe6d7291c6ebbd030397c (patch) | |
| tree | a6f43767b2c3254e501c4ce0af628dfd159ad600 /indra/newview/llgesturemgr.cpp | |
| parent | 9514210beb1ae2ec49f1cf15e5a4f7af5ae56657 (diff) | |
| parent | 207d9fd767895a3470722fb298eeef4f338e479a (diff) | |
merge
Diffstat (limited to 'indra/newview/llgesturemgr.cpp')
| -rw-r--r-- | indra/newview/llgesturemgr.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/newview/llgesturemgr.cpp b/indra/newview/llgesturemgr.cpp index 05fd9640c8..9aa86297fc 100644 --- a/indra/newview/llgesturemgr.cpp +++ b/indra/newview/llgesturemgr.cpp @@ -35,6 +35,7 @@ // library #include "llaudioengine.h" #include "lldatapacker.h" +#include "llfloaterreg.h" #include "llinventory.h" #include "llkeyframemotion.h" #include "llmultigesture.h" @@ -51,7 +52,7 @@ #include "llviewermessage.h" #include "llvoavatarself.h" #include "llviewerstats.h" -#include "llnearbychatbar.h" +#include "llfloaterimnearbychat.h" #include "llappearancemgr.h" #include "llgesturelistener.h" @@ -997,7 +998,8 @@ void LLGestureMgr::runStep(LLMultiGesture* gesture, LLGestureStep* step) const BOOL animate = FALSE; - LLNearbyChatBar::getInstance()->sendChatFromViewer(chat_text, CHAT_TYPE_NORMAL, animate); + (LLFloaterReg::getTypedInstance<LLFloaterIMNearbyChat>("nearby_chat"))-> + sendChatFromViewer(chat_text, CHAT_TYPE_NORMAL, animate); gesture->mCurrentStep++; break; |