diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-04-06 19:20:03 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-04-06 19:20:03 -0400 |
| commit | 52615d251bc9261fe5765feefbcd31021bd75934 (patch) | |
| tree | 2e259b393c6d2405d4a5e30ae9dd25e282c78a4d /indra/newview/llimview.cpp | |
| parent | 0a802ae351153008b40d42106c866836d0ee4954 (diff) | |
| parent | a1a5a793a70f62c977e97b7433840fcb70f47c03 (diff) | |
pull pack late beta fixes from 2.6.3
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. |