From 27cf9777f2ba32ae22979e1a0f205b4422ceaef2 Mon Sep 17 00:00:00 2001
From: Whirly <none@none>
Date: Sun, 23 Sep 2012 09:39:13 +0100
Subject: [PATCH] FIRE-7614 : Added toolbar button for Contact Sets

---
 indra/newview/app_settings/commands.xml           |  11 +++++++++++
 indra/newview/skins/default/textures/textures.xml |   2 ++
 .../textures/toolbar_icons/contact_sets.png       | Bin 0 -> 925 bytes
 indra/newview/skins/default/xui/en/strings.xml    |   2 ++
 4 files changed, 15 insertions(+)
 create mode 100644 indra/newview/skins/default/textures/toolbar_icons/contact_sets.png

diff --git a/indra/newview/app_settings/commands.xml b/indra/newview/app_settings/commands.xml
index b1aa1623a7..0c447faea8 100644
--- a/indra/newview/app_settings/commands.xml
+++ b/indra/newview/app_settings/commands.xml
@@ -409,5 +409,16 @@
            is_running_function="Floater.IsOpen"
            is_running_parameters="phototools_camera"
            />
+		   
+  <command name="contact_sets"
+           available_in_toybox="true"
+           icon="contact_sets"
+           label_ref="Command_Contact_Sets_Label"
+           tooltip_ref="Command_Contact_Sets_Tooltip"
+           execute_function="Floater.Toggle"
+           execute_parameters="contactsets"
+           is_running_function="Floater.IsOpen"
+           is_running_parameters="contactsets"
+           />
 
 </commands>
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index fb5a6490fb..451964b9ff 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -708,6 +708,8 @@ with the same filename but different name
   <texture name="asset_blacklist" file_name="toolbar_icons/asset_blacklist.png" preload="true" />
   <texture name="phototools" file_name="toolbar_icons/phototools.png" preload="true" />
   <texture name="phototools_camera" file_name="toolbar_icons/phototools_cam.png" preload="true" />
+  <texture name="contact_sets" file_name="toolbar_icons/contact_sets.png" preload="true" />
+  
 
   <texture name="Unread_Chiclet" file_name="bottomtray/Unread_Chiclet.png" preload="false" />
   <texture name="Unread_IM" file_name="bottomtray/Unread_IM.png" preload="false" />
diff --git a/indra/newview/skins/default/textures/toolbar_icons/contact_sets.png b/indra/newview/skins/default/textures/toolbar_icons/contact_sets.png
new file mode 100644
index 0000000000000000000000000000000000000000..0249b7e55f356a11da3f84c1d7748cf8f17152e1
GIT binary patch
literal 925
zcmV;O17iG%P)<h;3K|Lk000e1NJLTq000sI000sQ1^@s6R?d!B00009a7bBm000XU
z000XU0RWnu7ytkOAY({UO#lFTB>(_`g8%^e{{R4h=>PzAFaQARU;qF*m;eA5Z<1fd
zMgRZ<BS}O-RCwB~lubw*X&A@<?__4*!z4DYWh*F!AU2I_z!ei}{X(dR7DZI*$Ds<l
zf`{Eb2!TDQm*PQB7OhZE1&b9e6pR$<2N)bE*xiF}ArMitjL8(E!Hi5MI`3rmuvLTf
z<I?}}c^`i7^TGcimSy34h+kP*foYn^$;km@42eVnPNx&8R0@nS<mcxj8jWIaZx4bX
zKv9&ZMMXt7!r}0Xs;a6#>+9?P2LS*f1OSjur=e*YD5YSGoy94ou-om>H0^yL5GVzJ
zmX?-3Mn^}B0Neopj#3Ii5MUSvBuN@0gvg4bykA^gynA$X1j8^O%Q9wWW_&$8J*C<0
z1OkEEot>Rm0D#}x+Cnm!L?V%RIygAk^(m(i!2Q+L)xvl@erIE2V@?o+=NIQ<v)LdB
z!Vds|si`S6H#gh&_xG(+1%tuZ`1trsD@y|d0}n<<M&2;SEX%Si!!WGj;o(=OP)^e{
z*lad2FE0-Oz!<~s?ryZLt?gF!@7>+qzsKY8SE*DA0HEtSlF8(=v+61<E8%cBv{)?m
zTUlAzC0*BXaB#pXDk_}WpiCwMp69Q5y<X?(0vZ|`ng}76LZQ%0uC}%oZnqnh(yNN1
zWJFQK&dyFe5{a;EP&gdcW3iZaaZW=+L;W2c9i^Pp>4YRnoG6MPb8~Y!04Odlc1=%D
zKh$*{0HCU>6$*u(R99DDy9nYq4t~G?k<H`rpr)o~ud%W5C!Xh_swyN&`rGAlRd_s}
zA9<dKX`1Bl@Gy6MeSN*8q{KxjCD}03G%usCukWwy?MzNizFk;Yh+3b~?Ck7^iHV8T
zi}B;*V~fnq&B^WU?S%layu5t0wzl?fe}8|~mpnB#HujIh;fRQ$c$pBA0btX0{gC(h
zeEFwI+uPfU+wH#oHFK7im;W4%Mt!ZVt)P^i*$CMs27|$mo12@4^$m4(b={nwpNFcd
z=kD+A?fsSKd3!pYHVO&~ZZ<VF-TT(b@caG0)Ya9!<v8vf<n?+VXEGTWhJi>V@_K1$
z$!D4-1Ms;+MF2pS<#)0y<K*Pz{NZ~Yw*LkIuRO!PybDZ}00000NkvXXu0mjfMKi7M

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 e2ca51c29c..962cd81814 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -3994,6 +3994,7 @@ Try enclosing path to the editor with double quotes.
   <string name="Command_Asset_Blacklist_Label">Asset blacklist</string>
   <string name="Command_Phototools_Label">Phototools</string>
   <string name="Command_Phototools_View_Label">Phototools camera</string>
+  <string name="Command_Contact_Sets_Label">Contact sets</string>
 
   <string name="Command_AboutLand_Tooltip">Information about the land you're visiting</string>
   <string name="Command_Appearance_Tooltip">Change your avatar</string>
@@ -4034,6 +4035,7 @@ Try enclosing path to the editor with double quotes.
   <string name="Command_Asset_Blacklist_Tooltip">Opens the list of all the items you have blacklisted</string>
   <string name="Command_Phototools_Tooltip">Tools for full-featured image making.</string>
   <string name="Command_Phototools_View_Tooltip">Advanced phototools camera controls</string>
+  <string name="Command_Contact_Sets_Tooltip">Opens contact sets (CTRL+ALT+SHIFT+C)</string>
 
   <string name="Toolbar_Bottom_Tooltip">currently in your bottom toolbar</string>
   <string name="Toolbar_Left_Tooltip"  >currently in your left toolbar</string>