diff options
| author | Alexei Arabadji <aarabadji@productengine.com> | 2009-12-03 18:59:57 +0200 |
|---|---|---|
| committer | Alexei Arabadji <aarabadji@productengine.com> | 2009-12-03 18:59:57 +0200 |
| commit | ebdb78ef3b25247fd86f48833004b4254ca8e360 (patch) | |
| tree | 83c427cbfd55d3557174ea4174bb59a85dc3bcb0 | |
| parent | 501bb663ac89bc3918f00dc864e356a027c5a839 (diff) | |
| parent | 8d2752c3a6b390758d567d090347eec85b73ad8d (diff) | |
Automated merge with https://hg.aws.productengine.com/secondlife/viewer-2-0/
--HG--
branch : product-engine
| -rw-r--r-- | indra/newview/llimview.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp index 22cc799ef0..d3058e67af 100644 --- a/indra/newview/llimview.cpp +++ b/indra/newview/llimview.cpp @@ -1394,13 +1394,13 @@ void LLIncomingCallDialog::processCallResponse(S32 response) } else { - LLUUID session_id = gIMMgr->addSession( + LLUUID new_session_id = gIMMgr->addSession( mPayload["session_name"].asString(), type, session_id); - if (session_id != LLUUID::null) + if (new_session_id != LLUUID::null) { - LLIMFloater::show(session_id); + LLIMFloater::show(new_session_id); } std::string url = gAgent.getRegion()->getCapability( @@ -1488,13 +1488,13 @@ bool inviteUserResponse(const LLSD& notification, const LLSD& response) } else { - LLUUID session_id = gIMMgr->addSession( + LLUUID new_session_id = gIMMgr->addSession( payload["session_name"].asString(), type, session_id); - if (session_id != LLUUID::null) + if (new_session_id != LLUUID::null) { - LLIMFloater::show(session_id); + LLIMFloater::show(new_session_id); } std::string url = gAgent.getRegion()->getCapability( |