diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2011-05-10 13:57:41 -0600 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2011-05-10 13:57:41 -0600 |
| commit | 2a61d908e790bfd554f3f0968b320a6e2f4d42c4 (patch) | |
| tree | 9e7cd6854a5e6b6c8d6cea31d9d4a8b8f649af7e /indra/newview/llimview.cpp | |
| parent | e32d1cf7564dd38664781ea7360fa8daa132961c (diff) | |
| parent | b5c834c6fdcee7d7238bebfc561ecee3ecca3589 (diff) | |
Merge
Diffstat (limited to 'indra/newview/llimview.cpp')
| -rw-r--r-- | indra/newview/llimview.cpp | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp index 0ef502b81b..ec3fe48151 100644 --- a/indra/newview/llimview.cpp +++ b/indra/newview/llimview.cpp @@ -3183,10 +3183,6 @@ public: //just like a normal IM //this is just replicated code from process_improved_im //and should really go in it's own function -jwolk - if (gNoRender) - { - return; - } LLChat chat; std::string message = message_params["message"].asString(); @@ -3263,11 +3259,6 @@ public: } //end if invitation has instant message else if ( input["body"].has("voice") ) { - if (gNoRender) - { - return; - } - if(!LLVoiceClient::getInstance()->voiceEnabled() || !LLVoiceClient::getInstance()->isVoiceWorking()) { // Don't display voice invites unless the user has voice enabled. |