From e51ec77431380891b98c40e89edf8f57d90710c4 Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Thu, 1 Apr 2021 13:47:18 +0300
Subject: [PATCH] SL-15053 Use previous icon for Nearby chat

---
 indra/newview/llconversationview.cpp          |   4 +-
 indra/newview/llfloaterimsessiontab.cpp       |  12 +++-
 .../textures/icons/nearby_chat_icon.png       | Bin 1035 -> 399 bytes
 .../default/xui/en/floater_im_session.xml     |  57 ++++++++++--------
 .../xui/en/panel_conversation_list_item.xml   |  56 +++++++++--------
 5 files changed, 73 insertions(+), 56 deletions(-)

diff --git a/indra/newview/llconversationview.cpp b/indra/newview/llconversationview.cpp
index 7c9027d1b5..71346b4b43 100644
--- a/indra/newview/llconversationview.cpp
+++ b/indra/newview/llconversationview.cpp
@@ -249,8 +249,8 @@ BOOL LLConversationViewSession::postBuild()
 		}
 		case LLConversationItem::CONV_SESSION_NEARBY:
 		{
-			mItemPanel->getChild<LLLayoutPanel>("session_icon_panel")->setVisible(false);
-		
+			LLIconCtrl* icon = mItemPanel->getChild<LLIconCtrl>("nearby_chat_icon");
+			icon->setVisible(true);
 			mSpeakingIndicator->setSpeakerId(gAgentID, LLUUID::null, true);
 			mIsInActiveVoiceChannel = true;
 			if(LLVoiceClient::instanceExists())
diff --git a/indra/newview/llfloaterimsessiontab.cpp b/indra/newview/llfloaterimsessiontab.cpp
index 492f63a700..e7f428c06a 100644
--- a/indra/newview/llfloaterimsessiontab.cpp
+++ b/indra/newview/llfloaterimsessiontab.cpp
@@ -48,6 +48,7 @@
 
 const F32 REFRESH_INTERVAL = 1.0f;
 const std::string ICN_GROUP("group_chat_icon");
+const std::string ICN_NEARBY("nearby_chat_icon");
 const std::string ICN_AVATAR("avatar_icon");
 
 void cb_group_do_nothing()
@@ -346,8 +347,6 @@ BOOL LLFloaterIMSessionTab::postBuild()
 
 	assignResizeLimits();
 
-	getChild<LLLayoutPanel>("session_icon_layout_panel")->setVisible(mSessionID.notNull());
-
 	return result;
 }
 
@@ -727,6 +726,15 @@ void LLFloaterIMSessionTab::updateChatIcon(const LLUUID& id)
 			icon->setValue(id);
 		}
 	}
+	else
+	{
+		if (mIsNearbyChat)
+		{
+			LLIconCtrl* icon = getChild<LLIconCtrl>(ICN_NEARBY);
+			icon->setVisible(true);
+		}
+	}
+
 }
 
 void LLFloaterIMSessionTab::hideAllStandardButtons()
diff --git a/indra/newview/skins/default/textures/icons/nearby_chat_icon.png b/indra/newview/skins/default/textures/icons/nearby_chat_icon.png
index 2cb577776da8403e0b09ae1c9fe9a3af43dee90f..5ac4258b9da117d316a5abf15c405d136a19fd48 100644
GIT binary patch
delta 336
zcmV-W0k8gx2#*7hNPht_Nkl<Zc-mt8|NlP&H31U?l>sgTWr5fSi22dP1%cQLh^28E
z$cV+uAjQ+5mOTgJG$hLxKn?u^#3?}hmKYZbBZ-69EKoKll8afOau|RGi`XR~UIWB>
zQ2Gy4{3{Um0dW8jp9JDt#Cn-(k-`SV3TX0@K->?+n}K*T7JqpKs6GrA3PLr2!sr4J
z*FxocfmjVm{R1G*g|eH0*Z_z>LdD)AyHE`&zzvYXRu0WYa!9^0fU^0KErl6)5r}U<
z*~k%b5zWB!Q2G~C9RpO~MPefbWP2twZGzI|Ol)b7Zn2D<Hd~=F8-XU53>B}#m2I&J
z8bT8_2t*=95J@jIQG<Xf5Ni-?;5}$kfCV^mPPqeRgObQ&tbPWCAr{OA#40%C)PR@;
iha7z(WpEh?5MTi7?SIJ0zrz^-0000<MNUMnLSTX`zlVPS

delta 977
zcmV;?11|iJ1B(cdNPh#ZNkl<Zc-rJt+e?#S7=QL{o^|uEc}Qg8A=Dw5ni`6NhX|)w
zWC{^VRD>7Og`|0-UUVUX5@m>X5wr^-be$|QOvKVK%89896vwtwHxF~^Ja6`U2K@)#
z^}@^de$V%ue!t)Iexl>!V>-zt&<U>-PbeuZEv3D^JxWSSI)77JTdSRzn0P!kHrD0o
z=}BvAYqYhsMLs@0B$Z0(;NXD#{r%m6R;!hAb8{<-ii#ezwY6Q*>2%ZVCv0zTlef3G
z9LWX|;L+FD_rYefQF?khMMXtXaBwh%hljHdG2i@5O--fU-CfdZwVyUOHy!o$^@Bk{
zK}s$z$Ye6AtADHOLS=b#bMwW;#YMy6;URYvhy*^Igx{S`Cy7KNZq5q@0<ma)eSN91
zvGD?YB*@W?q$DmYD@&=Ws(RSj*?D(rYHBDXB!r@)qt8}WR(?Sj*8Tl`U0hroMMOl9
zAP7v&)xyHUchl3;U(t~f2pvegTwY#&56yfQa&mI+*njPI8yqyu4<JcvYHD5@42Iu;
z-#<4uM}B^O?maUzLp?n`gD9-8uCDHdEs$ei?^#}6Hs$5z)d(pmDS0pqyId{@2W4br
zr~ygY+uM5!Fs*C@ykzWi%pbb4X*8N@z*9h!>%P9e+=O#>cD7%oQl(44VH8x>#Ky+D
z)y&Gu%71k@92O+~;pOE;p`oGqK=A?m31+idy}G*k9{lPd+)w!CLzE7q(a3xnP&|a^
zkePN#BoY#f#mticl3h3-2LuFgcL6xF*?s<}HntNsF~{%%Lbiz{fbbigsOIPA-9`kA
zCnqQ0280B?UOyWd8TnQ&mtRJ(=fJ>#md8w~RDYgEauwd6Vg87bz=x4;2rzs~NJz*(
zIy&;^IT{}yf4#A>VS#E-kX#1%&ZVWLS1T(kFOUpwN4_N`C69J?cK!?v4L!#c@W6}W
z<Kv4UpiUSa9qq!XC_rchSBImmqoboNEiElotyW*<`D2cF^Eo>^`wG70cXxMRga0bu
zo`1x|#7npYvBSf|Ps9p^!W<J5a~_i47#SJSpqp**Vgjdp*5SF&{7p_ylEq>nh+>3z
zPx1b3VPS!wvaF$@;SCDTV5IH~fJZGYEw`Ye6I0(G78Z7j6Cm&xIJGnB9v&V9sKoGq
zz-}^`%utt;$(x#*-a>V0YisLGzWZW8<x1K51E-G#1qIhZ?i!rGW7vs<c(Yhs7|GlN
z&Wj5a7Z;agW@c8jx3^!0h*SJc^#A=}{|Ybw{L2ME*D=J?00000NkvXXu0mjf7sb^>

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 f61e5f1acc..15f02ab9c3 100644
--- a/indra/newview/skins/default/xui/en/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_session.xml
@@ -265,33 +265,38 @@
                  bottom="-1"
                  left="0"
                  right="-1">
-                    <layout_panel
-                     auto_resize="false"
-                     name="session_icon_layout_panel"
-                     width="24">
-                      <avatar_icon
-                       follows="left|bottom"
-                       name="avatar_icon"
-                       height="20"
-                       default_icon_name="Generic_Person"
-                       layout="topleft"
-                       left="3"
-                       bottom="-9"
-                       visible="false"
-                       width="20" />
-                      <group_icon
-                       follows="left|bottom"
-                       name="group_chat_icon"
-                       height="20"
-                       default_icon_name="Generic_Group"
-                       layout="topleft"
-                       left="3"
-                       bottom="-9"
-                       visible="false"
-                       width="20" />
-                    </layout_panel>
                     <layout_panel
                      name="input_editor_layout_panel">
+                        <avatar_icon
+                         follows="left|bottom"
+                         name="avatar_icon"
+                         height="20"
+                         default_icon_name="Generic_Person"
+                         layout="topleft"
+                         left="3"
+                         bottom="-9"
+                         visible="false"
+                         width="20" />
+                        <group_icon
+                         follows="left|bottom"
+                         name="group_chat_icon"
+                         height="20"
+                         default_icon_name="Generic_Group"
+                         layout="topleft"
+                         left="3"
+                         bottom="-9"
+                         visible="false"
+                         width="20" />
+                        <icon
+                         follows="left|bottom"
+                         height="20"
+                         image_name="Nearby_chat_icon"
+                         layout="topleft"
+                         left="3"
+                         bottom="-9"
+                         name="nearby_chat_icon"
+                         visible="false"
+                         width="20"/>
                         <chat_editor
                          layout="topleft"
                          expand_lines_count="5"
@@ -305,7 +310,7 @@
                          spellcheck="true"
                          tab_group="3"
                          bottom="-8"
-                         left="5"
+                         left_pad="5"
                          right="-5"
                          wrap="true" />
                     </layout_panel>
diff --git a/indra/newview/skins/default/xui/en/panel_conversation_list_item.xml b/indra/newview/skins/default/xui/en/panel_conversation_list_item.xml
index 3be2beb0aa..4372cf69bf 100644
--- a/indra/newview/skins/default/xui/en/panel_conversation_list_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_conversation_list_item.xml
@@ -6,41 +6,45 @@
  name="conversation_list_item"
  mouse_opaque="false"
  width="120">
-
+    <avatar_icon
+     follows="top|left"
+     height="20"
+     default_icon_name="Generic_Person"
+     layout="topleft"
+     left="9"
+     top="2"
+     visible="false"
+     width="20" />
+    <group_icon
+     follows="top|left"
+     height="20"
+     default_icon_name="Generic_Group"
+     layout="topleft"
+     left="9"
+     top="2"
+     visible="false"
+     width="20" />
+    <icon
+     follows="top|left"
+     height="20"
+     image_name="Nearby_chat_icon"
+     layout="topleft"
+     left="10"
+     name="nearby_chat_icon"
+     top="3"
+     visible="false"
+     width="20"/>
     <layout_stack
      animate="false"
      follows="all"
      height="24"
      layout="topleft"
-     left="9"
+     left="30"
      mouse_opaque="false"
      name="conversation_item_stack"
      orientation="horizontal"
      top="0"
-     width="109">
-      <layout_panel
-        auto_resize="false"
-        name="session_icon_panel"
-        width="24">
-        <avatar_icon
-         follows="top|left"
-         height="20"
-         default_icon_name="Generic_Person"
-         layout="topleft"
-         left="0"
-         top="2"
-         visible="false"
-         width="20" />
-        <group_icon
-         follows="top|left"
-         height="20"
-         default_icon_name="Generic_Group"
-         layout="topleft"
-         left="0"
-         top="2"
-         visible="false"
-         width="20" />
-        </layout_panel>
+     width="90">
         <layout_panel
          auto_resize="false"
          user_resize="false"