diff options
| author | Graham Linden <graham@lindenlab.com> | 2019-05-23 10:02:22 -0700 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2019-05-23 10:02:22 -0700 |
| commit | f51f42f262b816ab800f0f4e821408ec7dbec3fa (patch) | |
| tree | 5ae5e98074942c2e676fb7efb84ab0db681b066e | |
| parent | d0a0eede63fdbd4ba597b86cbfbeb5b394ed2395 (diff) | |
| parent | 25f9dc9b5a44e2d91a5d55d4cce6149a55e16432 (diff) | |
Merge
| -rw-r--r-- | indra/newview/app_settings/commands.xml | 11 | ||||
| -rw-r--r-- | indra/newview/skins/default/textures/textures.xml | 1 | ||||
| -rw-r--r-- | indra/newview/skins/default/textures/toolbar_icons/environments.png | bin | 0 -> 1630 bytes | |||
| -rw-r--r-- | indra/newview/skins/default/xui/en/strings.xml | 2 |
4 files changed, 14 insertions, 0 deletions
diff --git a/indra/newview/app_settings/commands.xml b/indra/newview/app_settings/commands.xml index 412d3a53b3..2c7b857dd0 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 beffe71863..4dc9a8ddf5 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 Binary files differnew file mode 100644 index 0000000000..620db9f793 --- /dev/null +++ b/indra/newview/skins/default/textures/toolbar_icons/environments.png diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 26d22ed0a9..2ac385d3f3 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> |
