diff options
| author | Brian McGroarty <soft@lindenlab.com> | 2008-03-19 00:01:42 +0000 |
|---|---|---|
| committer | Brian McGroarty <soft@lindenlab.com> | 2008-03-19 00:01:42 +0000 |
| commit | 25de7377c1f6cc2fa6f217b9e9eaca84ab36748d (patch) | |
| tree | ea1770b154433082dbcf06da043c0c3a45f7c5f3 /indra/newview/llimview.cpp | |
| parent | 2d9afdaa03f0d44d05e3f2fb9d99dd5b059a9cac (diff) | |
QAR-377 maintenance-6 merge:
svn merge -r 82602:82644 svn+ssh://svn/svn/linden/qa/maintenance-6-merge-82557 release/
Diffstat (limited to 'indra/newview/llimview.cpp')
| -rw-r--r-- | indra/newview/llimview.cpp | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp index 4dc5bfddec..3242e7d474 100644 --- a/indra/newview/llimview.cpp +++ b/indra/newview/llimview.cpp @@ -80,7 +80,7 @@ LLIMMgr* gIMMgr = NULL; // // Statics // -//*FIXME: make these all either UIStrings or Strings +// *FIXME: make these all either UIStrings or Strings static LLString sOnlyUserMessage; static LLUIString sOfflineMessage; static LLUIString sInviteMessage; @@ -374,7 +374,7 @@ LLIMMgr::LLIMMgr() : mFriendObserver = new LLIMViewFriendObserver(this); LLAvatarTracker::instance().addObserver(mFriendObserver); - //*HACK: use floater to initialize string constants from xml file + // *HACK: use floater to initialize string constants from xml file // then delete it right away LLFloaterIM* dummy_floater = new LLFloaterIM(); delete dummy_floater; @@ -738,7 +738,7 @@ void LLIMMgr::inviteToSession( if (channelp && channelp->callStarted()) { // you have already started a call to the other user, so just accept the invite - inviteUserResponse(0, invite); + inviteUserResponse(0, invite); // inviteUserResponse deletes return; } @@ -752,7 +752,7 @@ void LLIMMgr::inviteToSession( if (gSavedSettings.getBOOL("VoiceCallsFriendsOnly")) { // invite not from a friend, so decline - inviteUserResponse(1, invite); + inviteUserResponse(1, invite); // inviteUserResponse deletes return; } } @@ -771,13 +771,17 @@ void LLIMMgr::inviteToSession( args["[GROUP]"] = session_name; LLNotifyBox::showXml(notify_box_type, - args, - inviteUserResponse, - (void*)invite); + args, + inviteUserResponse, + (void*)invite); // inviteUserResponse deletes } mPendingInvitations[session_id.asString()] = LLSD(); } + else + { + delete invite; + } } //static |