From 25f9dc9b5a44e2d91a5d55d4cce6149a55e16432 Mon Sep 17 00:00:00 2001
From: maxim_productengine <mnikolenko@productengine.com>
Date: Wed, 22 May 2019 18:05:15 +0300
Subject: [PATCH] SL-10984 [EEP] Add a toolbar button to open My Environments
---
indra/newview/app_settings/commands.xml | 11 +++++++++++
.../newview/skins/default/textures/textures.xml | 1 +
.../textures/toolbar_icons/environments.png | Bin 0 -> 1630 bytes
indra/newview/skins/default/xui/en/strings.xml | 2 ++
4 files changed, 14 insertions(+)
create mode 100644 indra/newview/skins/default/textures/toolbar_icons/environments.png
diff --git a/indra/newview/app_settings/commands.xml b/indra/newview/app_settings/commands.xml
index 412d3a53b32..2c7b857dd07 100644
--- a/indra/newview/app_settings/commands.xml
+++ b/indra/newview/app_settings/commands.xml
@@ -303,4 +303,15 @@
is_running_function="Floater.IsOpen"
is_running_parameters="grid_status"
/>
+ <command name="myenvironments"
+ available_in_toybox="true"
+ is_flashing_allowed="true"
+ icon="Command_Environments_Icon"
+ label_ref="Command_Environments_Label"
+ tooltip_ref="Command_Environments_Tooltip"
+ execute_function="Floater.ToggleOrBringToFront"
+ execute_parameters="my_environments"
+ is_running_function="Floater.IsOpen"
+ is_running_parameters="my_environments"
+ />
</commands>
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index beffe718635..4dc9a8ddf57 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -145,6 +145,7 @@ with the same filename but different name
<texture name="Command_MiniCart_Icon" file_name="toolbar_icons/mini_cart.png" preload="true" />
<texture name="Command_MiniMap_Icon" file_name="toolbar_icons/mini_map.png" preload="true" />
<texture name="Command_Move_Icon" file_name="toolbar_icons/move.png" preload="true" />
+ <texture name="Command_Environments_Icon" file_name="toolbar_icons/environments.png" preload="true" />
<texture name="Command_Outbox_Icon" file_name="toolbar_icons/outbox.png" preload="true" />
<texture name="Command_People_Icon" file_name="toolbar_icons/people.png" preload="true" />
<texture name="Command_Picks_Icon" file_name="toolbar_icons/picks.png" preload="true" />
diff --git a/indra/newview/skins/default/textures/toolbar_icons/environments.png b/indra/newview/skins/default/textures/toolbar_icons/environments.png
new file mode 100644
index 0000000000000000000000000000000000000000..620db9f7930e8f8da888e8e48c9c9f81778f1e87
GIT binary patch
literal 1630
zcmaJ>c~BEq9F9R$6f9UpifFe{8AX!a1OiE#pd=dw(_~@*!2@JXHY7FK4Z9nYAma#B
zEwt7vUI-qjSbNY>5s^c|wu3|iGF4!ZQqZwVtMwd39JCt*+CNHn=IuM?`@Y}tzIpj-
z)e^sn!4nw_hF^RftfA*Ao-tt@{a@bnRWdz&K*>|61YA$q5CUby>hQHF5N}2@Pz{Rc
z9GQ)%n8EN0H72G|DauboTHMS*JQ$AMY@yi<hIpaff@s&F6tEV}Fk%wcqv}g6z^Ie3
zlKDzVX_27@V_X)2CS<7+wOQ-5LLF;i3?R0PXaO@yA%NX%!bp)_!Wz^S(QD5!$N~l-
z)H(_4T~aAZH6X(Y6yS5B*jg@^3q%V!T)rTJ#}5a15SI@^LXZowA+CrEiFgn&^s(q@
zgibHgz>9}s(K`vtKv5PE2-<8mjxB<N6B!^^C=`Ma59IOKG=fb!Fbc7=F>>~>0*sPc
z!f2t4I0kqWk+ry$lCbDZ-<4ptjL2f-P@Cw6fp)|KaygKvq+y^^`TtO}c?3;T8uXuh
z|5KPubXZVOgOa$F(9##DpX~`{5y=P?p>QG*$4$dsR2y&#Ck?m-kjVzS2Fyz~VmjPL
z&L89`m7;izq!3Jt#={a8t->)Hbt0aS2S*9zylAO>F_$YB3i!eZfe;cz2;>kP9Thpu
zg>kLbjAGO<SN9J$VpOij4rU7-8Ab`?dQ`WVz|Fv5*&^fUxj>`p4RLj&=fWM83)0De
zp3D8$We*?G4)QEVtV?f3%#UKU;|bc@f%*Oi84PAqJRF;7@5pwh#_dL?HZ)%}VbJ`2
z;S-mZd=?wv+xhbur!~P}qm7lu!f~)a)zYwMx_9;GXvL(Xg}G@H*z@!FyK?m14coNe
z-VCYiygVZyVJk-7y7jh3;<~zjW?$`tnn%xyipe+k9C5qmbZp+*U3PgPb4&f9hqk-K
zf!5YmgVnmHyu5mV*;cRUIXtE&rn%|)^GH8mUp4Q5GcU|5mAN5jP2ZZFR1=5k<7+mV
z)Hn|MO`fbdl~__(80<J*aLngy?)Eybv?N6)LF^LGde7b5yt_UfIJdI)nexE0kjhQU
zzSnj9>tU`}-7jAsBT4dmtJV5CDJ+TkNSc0v=f4WBtMAH_0b8a-4h#$=>oYPGS+!|h
zXD?i6MA67#w_hc~dFZoof88qRBVJGX3X4Op|NUg!pS9ET;X}7fQGeXOf26-ZtDxZy
zak#au?XBTlN8n%fN%k?>(&c-L9{$wc9)z6j`t)4rYR*3A(i3y8u-PD}FjP(T9XGf7
z*QT15g7DC(cZ<D$t30lr2VYoS7Vx(HJ|${2MUms4mPn5-a=YC(Zrp%Rr(8Q##!`*B
zQg|jTNR)O=6IO0E^i>eS8xM`$zWKo%r(kkNCl;Nt({=Az?~^B)j)E2Ii&aZPcjuS1
z%$qyK=fx#MRaMoj^j{GFvGI?+ipHO32P!&yEZNOE-uTkeQWY2;u9nHXrhOrIlxD|#
zxUW#wTkOh7489sOHsrfmt_AcPG^4-2|9D5o%9%ShY(BFbVxITElZqbEb~}T-155nM
zH?593IMCVErBWyq(*v%235a+6*loKT(DO7Vr>$-k+uhQ#OsaRPPBt1MUG6Sp4eNT6
z#b5mXMQ<wi<n8NKufFbf1@-p!9$f?g<G)#NSg;Mx`?$O4F`hf=wpb$w+51C)Z||jR
xZ^+XU=F4esmO&*o?G+UjhRn>JN5TfCr8BBu>}bbsN}@e4e!N@-mr2ue{|1X`cya&$
literal 0
HcmV?d00001
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 26d22ed0a9e..2ac385d3f32 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -4099,6 +4099,7 @@ Try enclosing path to the editor with double quotes.
<string name="Command_Conversations_Label">Conversations</string>
<string name="Command_Compass_Label">Compass</string>
<string name="Command_Destinations_Label">Destinations</string>
+ <string name="Command_Environments_Label">My Environments</string>
<string name="Command_Facebook_Label">Facebook</string>
<string name="Command_Flickr_Label">Flickr</string>
<string name="Command_Gestures_Label">Gestures</string>
@@ -4132,6 +4133,7 @@ Try enclosing path to the editor with double quotes.
<string name="Command_Conversations_Tooltip">Converse with everyone</string>
<string name="Command_Compass_Tooltip">Compass</string>
<string name="Command_Destinations_Tooltip">Destinations of interest</string>
+ <string name="Command_Environments_Tooltip">My Environments</string>
<string name="Command_Facebook_Tooltip">Post to Facebook</string>
<string name="Command_Flickr_Tooltip">Upload to Flickr</string>
<string name="Command_Gestures_Tooltip">Gestures for your avatar</string>
--
GitLab