diff options
| author | Don Kjer <don@lindenlab.com> | 2012-10-11 00:09:04 +0000 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2012-10-11 00:09:04 +0000 |
| commit | c06c35609c6683731eaea283468f6b32af18fea2 (patch) | |
| tree | 69e067fb2d8d602948d618ec7cb71ace149d6e39 /indra/newview/llimview.cpp | |
| parent | 19e43e4b588d4aec8f23498993a3a22c0e08a329 (diff) | |
Updating linux build to gcc4.6
Diffstat (limited to 'indra/newview/llimview.cpp')
| -rw-r--r-- | indra/newview/llimview.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp index 4000570872..57373704ef 100644 --- a/indra/newview/llimview.cpp +++ b/indra/newview/llimview.cpp @@ -2674,7 +2674,6 @@ void LLIMMgr::inviteToSession( // voice invite question is different from default only for group call (EXT-7118) std::string question_type = "VoiceInviteQuestionDefault"; - BOOL ad_hoc_invite = FALSE; BOOL voice_invite = FALSE; bool is_linden = LLMuteList::getInstance()->isLinden(caller_name); @@ -2697,13 +2696,11 @@ void LLIMMgr::inviteToSession( //else it's an ad-hoc //and a voice ad-hoc notify_box_type = "VoiceInviteAdHoc"; - ad_hoc_invite = TRUE; voice_invite = TRUE; } else if ( inv_type == INVITATION_TYPE_IMMEDIATE ) { notify_box_type = "InviteAdHoc"; - ad_hoc_invite = TRUE; } LLSD payload; @@ -3269,10 +3266,9 @@ public: } std::string buffer = saved + message; - BOOL is_this_agent = FALSE; if(from_id == gAgentID) { - is_this_agent = TRUE; + return; } gIMMgr->addMessage( session_id, |