diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2009-07-02 00:38:13 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2009-07-02 00:38:13 +0000 |
| commit | 39905b927d60e204438705728d2c214cb3f9ef81 (patch) | |
| tree | 7bb617cc204514b233e081457d905693aa0ae409 /indra/newview/llviewergesture.cpp | |
| parent | 687cff0eb8dfe663b99e18cfd953e0764d8ab372 (diff) | |
merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@873 https://svn.aws.productengine.com/secondlife/pe/stable@888 -> viewer-2.0.0-pe-4
Diffstat (limited to 'indra/newview/llviewergesture.cpp')
| -rw-r--r-- | indra/newview/llviewergesture.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llviewergesture.cpp b/indra/newview/llviewergesture.cpp index 2fb56fbcb8..bbd34835ca 100644 --- a/indra/newview/llviewergesture.cpp +++ b/indra/newview/llviewergesture.cpp @@ -133,11 +133,11 @@ void LLViewerGesture::doTrigger( BOOL send_chat ) } } - if ( send_chat && !mOutputString.empty()) + if (gBottomTray && 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); + gBottomTray->sendChatFromViewer(mOutputString, CHAT_TYPE_NORMAL, FALSE); } } |