summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorSergey Borushevsky <sborushevsky@productengine.com>2009-11-24 20:34:05 +0200
committerSergey Borushevsky <sborushevsky@productengine.com>2009-11-24 20:34:05 +0200
commit240c21cc2dd82dd41a664ec225fafb24bab44ca6 (patch)
treed09d7adaabfb2d7632e348b13bde59126bea87ed /indra/newview
parentc227f93b1a6f89847242261f634079d4d6bfbf08 (diff)
Related to implementation of EXT-2517 (Add support for the viewer 1.23 chat history style (widget-less))
- reverted changes in session processing code in LLIMFloater::onClose in rev. bd3f78cc1c42. --HG-- branch : product-engine
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llimfloater.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llimfloater.cpp b/indra/newview/llimfloater.cpp
index 795770d3db..ee93a9349a 100644
--- a/indra/newview/llimfloater.cpp
+++ b/indra/newview/llimfloater.cpp
@@ -110,10 +110,10 @@ void LLIMFloater::onFocusReceived()
// virtual
void LLIMFloater::onClose(bool app_quitting)
{
- if (!gIMMgr->hasSession(mSessionID)) return;
-
setTyping(false);
- gIMMgr->leaveSession(mSessionID);
+ // 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);
}
/* static */