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" /> + + 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 + 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 0000000000..ebcdf66d8b Binary files /dev/null and b/indra/newview/skins/default/textures/toolbar_icons/asset_blacklist.png differ 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. Fly Ground sit Sound explorer + Asset blacklist Information about the land you're visiting Change your avatar @@ -3970,6 +3971,7 @@ Try enclosing path to the editor with double quotes. Opens the region/estate tools (ALT+R) Toggle ground sit mode on/off (CTRL+ALT+S) Opens the sound explorer + Opens the list of all the items you have blacklisted currently in your bottom toolbar currently in your left toolbar