summaryrefslogtreecommitdiff
path: root/indra/newview/llimview.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-04-14 15:15:48 -0400
committerOz Linden <oz@lindenlab.com>2011-04-14 15:15:48 -0400
commit572e491acf2d9ca1701ec54df31632cbc9c253c8 (patch)
tree4fa39e7b5263f76a62f73d08a1dc8ab550d4ec05 /indra/newview/llimview.cpp
parent71f5c1f5e8bbf6b22776cd7f98aabecc7a48918d (diff)
parentb49446c863644d603ec2e1f86f12d24b1c4375c2 (diff)
pull back tags from viewer-release
Diffstat (limited to 'indra/newview/llimview.cpp')
-rw-r--r--indra/newview/llimview.cpp9
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.