From b887e9bf4fe221f80a762bcf765d92a9c646ccf0 Mon Sep 17 00:00:00 2001
From: Whirly <none@none>
Date: Thu, 19 Jul 2012 14:23:18 +0100
Subject: [PATCH] FIRE-6893 : Added asset blacklist to the toolbox

---
 indra/newview/app_settings/commands.xml          |  11 +++++++++++
 .../newview/skins/default/textures/textures.xml  |   1 +
 .../textures/toolbar_icons/asset_blacklist.png   | Bin 0 -> 1208 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/asset_blacklist.png

diff --git a/indra/newview/app_settings/commands.xml b/indra/newview/app_settings/commands.xml
index 86b3742e4b..82b07038c9 100644
--- a/indra/newview/app_settings/commands.xml
+++ b/indra/newview/app_settings/commands.xml
@@ -376,5 +376,16 @@
            is_running_function="Floater.IsOpen"
            is_running_parameters="sound_explorer"
            />
+		   
+  <command name="assetblacklist"
+           available_in_toybox="true"
+           icon="asset_blacklist"
+           label_ref="Command_Asset_Blacklist_Label"
+           tooltip_ref="Command_Asset_Blacklist_Tooltip"
+           execute_function="Floater.Toggle"
+           execute_parameters="ws_asset_blacklist"
+           is_running_function="Floater.IsOpen"
+           is_running_parameters="ws_asset_blacklist"
+           />		   
 
 </commands>
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index 450582c81a..416bca75d1 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -694,6 +694,7 @@ with the same filename but different name
   <texture name="regioninfo" file_name="toolbar_icons/region.png" preload="true" />
   <texture name="groundsit" file_name="toolbar_icons/groundsit.png" preload="true" />
   <texture name="sound_explorer" file_name="toolbar_icons/sound_explorer.png" preload="true" />
+  <texture name="asset_blacklist" file_name="toolbar_icons/asset_blacklist.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/asset_blacklist.png b/indra/newview/skins/default/textures/toolbar_icons/asset_blacklist.png
new file mode 100644
index 0000000000000000000000000000000000000000..ebcdf66d8b0871d4675ca0fa02b7d0a55df88905
GIT binary patch
literal 1208
zcmV;p1V{UcP)<h;3K|Lk000e1NJLTq000sI000sQ1^@s6R?d!B00009a7bBm0017s
z0017s0dCNBJ^%m!AY({UO#lFTB>(_`g8%^e{{R4h=>PzAFaQARU;qF*m;eA5Z<1fd
zMgRZ=K1oDDRCwBKR9#4$XB2+k?~BckX#N`W*)?s66LD^lAXAZIG72qbYYT=_0~<0g
zbXc~sv6YRn8|_tZhKwz(WUe>8=t^mVWoTxMkfb<L!GW#6k;I><G5Tr3l9(^~-dz-J
zyY*b2^PJ~-4(D)))oR6mqgX7$VzFRzbMxl8bLT!HgfJ5m6Qfe8^qZNP8Hl0?LI?n0
ze0&@LAfc4LMnVXIAP9&?qu+IPb$!{~+^k?21}9IReB0@C<^)0bK_Zd-Pn?*|=GPM0
zY!(KC;ilK?{T^?K_V#vXEEelkC=>vIU@-WC=*pEVM<7Zm=H}*9Znt}<s;Y{46Hy|O
zpjNB(ErY?Z!7vO)Mn(Vtj8?0KMx%jRt%g#m#Oc$g+pDUo7{A}29v&XvJ`{NP@L|I5
z_opi=Do8^^!zYc6jc96WIuekSmzRTOS;%BE2!en@p>QG=i&2lqQ=Z9Wkjv##a=Dz&
z&d%!N@i>e|qgYv4dBSKk;&40wV8Y=ro<Dz%d_Ir$^>r*RF8(Q(%dxby)Udd?sL|{7
zQjJC<4TVCQ<>lq~l}aTEhr=UdV`G?~pMU9yWmynHz_Kh-sT6pg|I6iaEqgqkr`y}x
zBFAwI01OQcZR>P8#^rLwS(Y8y-`|H^E`RBWVHiXrk>e(lDIt|ge=RL7#n8}@$?bM0
z4@m%^va*u#`F#6Mr}MpJG6|Mtf2^sg*=}lTG5~-il}c4KHa31?x7&5;bh@p&x*Erh
z9m|Z3jk)Z0`?s%dED#9X@9ys2jmP8QIPT)5OP7v6di3Z<KA-O=ckkZ)yR);?bO`qO
zeCY=d9^8&bqvLkF{Wq3nWrPqyDb0C2p3gXrd*|}y%U{`SHtk{0;Naj>(%RbkacgVq
zr_pFMtWYT6a5z4<TCIxp^>uMzU|=K|4E73wkUe|$>`%SDz3tW2)sjFUkiB>B-p@SG
z=j!U}EWu##HaUO(JX%^>u)Dj9va&Lil$7Avvu8Go#d7P~wQF^hQWT3tNF);6xpODt
z^?JWHo6YXMy*(5P1q=)fyx5v3ikO_7geZz1h@uFq)#_KNRPS;eR{;R4tE*z6P@qPm
zk=5yRO0`;DTPzmcPo6w!R;$(J0K5Qzj*bqPOeSV!WkpOTlXPlo>VQ&8CnhHTxqkin
zFE*R4+-9@MdU|?pjgF4)Q%dRd^mKk>V?*S5p4QjbD*%Am+uH-jabkae|9!1i3zbSG
zxq9_#M<^63J#*$v?}ZB&Qf+N*xl^Z3-B?&yP&yor4_THa9LJHqzP{nj&CMJDFgl$M
zdc7W*OvVw3M8r@i#2*|S+)pGDkjZ36e@8BtV_{(dJkS3T2m})Gc$|hpq4uq<EfD}D
z>2w+ZAP52;KYr|+nVE^KuCAh_qy)9KwXa?-*4EY#i^VWGIr)1wn>Fw3?1+c;e+K|G
Wp5^v5`U@-o0000<MNUMnLSTZuqdwvQ

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 b8586b4b6b..3045d1334b 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -3933,6 +3933,7 @@ Try enclosing path to the editor with double quotes.
   <string name="Command_Fly_Label">Fly</string>
   <string name="Command_Groundsit_Label">Ground sit</string>
   <string name="Command_Sound_Explorer_Label">Sound explorer</string>
+  <string name="Command_Asset_Blacklist_Label">Asset blacklist</string>
 
   <string name="Command_AboutLand_Tooltip">Information about the land you're visiting</string>
   <string name="Command_Appearance_Tooltip">Change your avatar</string>
@@ -3970,6 +3971,7 @@ Try enclosing path to the editor with double quotes.
   <string name="Command_Region_Tooltip">Opens the region/estate tools (ALT+R)</string>
   <string name="Command_Groundsit_Tooltip">Toggle ground sit mode on/off (CTRL+ALT+S)</string>
   <string name="Command_Sound_Explorer_Tooltip">Opens the sound explorer</string>
+  <string name="Command_Asset_Blacklist_Tooltip">Opens the list of all the items you have blacklisted</string>
 
   <string name="Toolbar_Bottom_Tooltip">currently in your bottom toolbar</string>
   <string name="Toolbar_Left_Tooltip"  >currently in your left toolbar</string>