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" /> + + 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 + + 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 0000000000..0249b7e55f Binary files /dev/null and b/indra/newview/skins/default/textures/toolbar_icons/contact_sets.png differ 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. Asset blacklist Phototools Phototools camera + Contact sets Information about the land you're visiting Change your avatar @@ -4034,6 +4035,7 @@ Try enclosing path to the editor with double quotes. Opens the list of all the items you have blacklisted Tools for full-featured image making. Advanced phototools camera controls + Opens contact sets (CTRL+ALT+SHIFT+C) currently in your bottom toolbar currently in your left toolbar