summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorJames Cook <james@lindenlab.com>2009-12-17 16:09:41 -0800
committerJames Cook <james@lindenlab.com>2009-12-17 16:09:41 -0800
commit6e17110201515bddf8f674f26d02b9b3334c483e (patch)
tree32a7345ed3e0cc0d4b75cf76e9542a4334e7f939 /indra
parent8a7f2ce8111e642876bc118dcc3a6ffbd88183e9 (diff)
EXT-3516 X Button should end IM session, _ button should hide
I don't like it, but I don't have a better suggestion. Reviewed with Steve.
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llimfloater.cpp10
1 files changed, 7 insertions, 3 deletions
diff --git a/indra/newview/llimfloater.cpp b/indra/newview/llimfloater.cpp
index 7dc21e6e23..ff1eb10366 100644
--- a/indra/newview/llimfloater.cpp
+++ b/indra/newview/llimfloater.cpp
@@ -122,9 +122,13 @@ void LLIMFloater::onFocusReceived()
void LLIMFloater::onClose(bool app_quitting)
{
setTyping(false);
- // SJB: We want the close button to hide the session window, not end it
- // *NOTE: Yhis is functional, but not ideal - it's still closing the floater; we really want to change the behavior of the X button instead.
- //gIMMgr->leaveSession(mSessionID);
+
+ // The source of much argument and design thrashing
+ // Should the window hide or the session close when the X is clicked?
+ //
+ // Last change:
+ // EXT-3516 X Button should end IM session, _ button should hide
+ gIMMgr->leaveSession(mSessionID);
}
/* static */