From ff6eea998daf353cfbff6b0323399bfd95492fcc Mon Sep 17 00:00:00 2001
From: Steve Bennetts <steve@lindenlab.com>
Date: Wed, 18 Nov 2009 18:08:32 -0800
Subject: [PATCH] Change close behavior to not end session. * NOTE: This is
functional, but not ideal - it's still closing the floater; we really want to
change the behavior of the X button instead. Also made the group IM floater a
little less broken.
---
indra/newview/llimfloater.cpp | 2 --
indra/newview/skins/default/xui/en/floater_im_session.xml | 4 ++--
.../skins/default/xui/en/panel_group_control_panel.xml | 3 +--
3 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/indra/newview/llimfloater.cpp b/indra/newview/llimfloater.cpp
index dbbf98ad08a..b7c614d09c3 100644
--- a/indra/newview/llimfloater.cpp
+++ b/indra/newview/llimfloater.cpp
@@ -106,8 +106,6 @@ void LLIMFloater::onFocusReceived()
// virtual
void LLIMFloater::onClose(bool app_quitting)
{
- if (!gIMMgr->hasSession(mSessionID)) return;
-
setTyping(false);
gIMMgr->leaveSession(mSessionID);
}
diff --git a/indra/newview/skins/default/xui/en/floater_im_session.xml b/indra/newview/skins/default/xui/en/floater_im_session.xml
index e972cf39bf7..c20aaea2aa3 100644
--- a/indra/newview/skins/default/xui/en/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_session.xml
@@ -10,9 +10,9 @@
top="0"
can_close="true"
can_dock="true"
- can_minimize="true"
+ can_minimize="false"
visible="true"
- width="350"
+ width="300"
can_resize="true"
min_width="300"
min_height="350">
diff --git a/indra/newview/skins/default/xui/en/panel_group_control_panel.xml b/indra/newview/skins/default/xui/en/panel_group_control_panel.xml
index 763dd7b9220..2fee2033f6f 100644
--- a/indra/newview/skins/default/xui/en/panel_group_control_panel.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_control_panel.xml
@@ -8,7 +8,7 @@
<avatar_list
color="DkGray2"
follows="left|top|right|bottom"
- height="130"
+ height="100"
ignore_online_status="true"
layout="topleft"
left="3"
@@ -32,7 +32,6 @@
background_visible="true"
bg_alpha_color="0.2 0.2 0.2 1"
border="false"
- bottom="1"
follows="left|bottom"
height="70"
left="0"
--
GitLab