diff options
| author | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-09-11 17:45:45 -0700 |
|---|---|---|
| committer | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-09-11 17:45:45 -0700 |
| commit | 7b78e72bf148d20a402eadb8629bf15dc2f100a3 (patch) | |
| tree | 4209d49b18635a5c58317268965641ce89f69287 /indra/newview/llviewergesture.cpp | |
| parent | ef39011f433d93ea72cf636d4c415b468f776a01 (diff) | |
| parent | cb8ce1141837cc450756764e03a4564f8ab0c9eb (diff) | |
merging in latest changes
Diffstat (limited to 'indra/newview/llviewergesture.cpp')
| -rw-r--r-- | indra/newview/llviewergesture.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llviewergesture.cpp b/indra/newview/llviewergesture.cpp index a2dea31d9b..71608b5280 100644 --- a/indra/newview/llviewergesture.cpp +++ b/indra/newview/llviewergesture.cpp @@ -33,6 +33,7 @@ #include "llviewerinventory.h" #include "sound_ids.h" // for testing +#include "llfloaterreg.h" #include "llkeyboard.h" // for key shortcuts for testing #include "llinventorymodel.h" #include "llvoavatar.h" @@ -130,7 +131,8 @@ void LLViewerGesture::doTrigger( BOOL send_chat ) { // Don't play nodding animation, since that might not blend // with the gesture animation. - LLNearbyChat::instance().sendChatFromViewer(mOutputString, CHAT_TYPE_NORMAL, FALSE); + (LLFloaterReg::getTypedInstance<LLNearbyChat>("nearby_chat"))-> + sendChatFromViewer(mOutputString, CHAT_TYPE_NORMAL, FALSE); } } |