diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-03-09 12:56:48 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-03-09 12:56:48 -0500 |
| commit | 0a873715677ef3fb28e8dab161acbe05ed8bd537 (patch) | |
| tree | 1f2e2c804bb7764bddbcb428c71edbcdeeb3da6f /indra/newview/skins | |
| parent | 11c6654479a299549dc0035faa894678a60e157e (diff) | |
| parent | eb7e48fc9015266fd2945873f12d925ffc6262ed (diff) | |
merge changes for vmrg-230
Diffstat (limited to 'indra/newview/skins')
| -rw-r--r-- | indra/newview/skins/default/textures/map_avatar_unknown_32.tga | bin | 0 -> 4140 bytes | |||
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_preview_animation.xml | 16 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/strings.xml | 3 |
3 files changed, 15 insertions, 4 deletions
diff --git a/indra/newview/skins/default/textures/map_avatar_unknown_32.tga b/indra/newview/skins/default/textures/map_avatar_unknown_32.tga Binary files differnew file mode 100644 index 0000000000..d1192478c6 --- /dev/null +++ b/indra/newview/skins/default/textures/map_avatar_unknown_32.tga diff --git a/indra/newview/skins/default/xui/en/floater_preview_animation.xml b/indra/newview/skins/default/xui/en/floater_preview_animation.xml index 8427c7b06f..3ea5f54f2c 100644 --- a/indra/newview/skins/default/xui/en/floater_preview_animation.xml +++ b/indra/newview/skins/default/xui/en/floater_preview_animation.xml @@ -41,18 +41,26 @@ label_selected="Stop" layout="topleft" left="10" - name="Anim play btn" + name="Inworld" tool_tip="Play this animation so that others can see it" top="47" - width="125" /> + width="125"> + <button.commit_callback + function="PreviewAnim.Play" + parameter="Inworld" /> + </button> <button height="20" label="Play Locally" label_selected="Stop" layout="topleft" left_pad="5" - name="Anim audition btn" + name="Locally" tool_tip="Play this animation so that only you can see it" top_delta="0" - width="125" /> + width="125"> + <button.commit_callback + function="PreviewAnim.Play" + parameter="Locally" /> + </button> </floater> diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 4bc72be49b..208f4c2d32 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -369,6 +369,9 @@ Please try logging in again in a minute.</string> <string name="anim_yes_happy">Yes (Happy)</string> <string name="anim_yes_head">Yes</string> + <!-- build floater --> + <string name="multiple_textures">Multiple</string> + <!-- world map --> <string name="texture_loading">Loading...</string> <string name="worldmap_offline">Offline</string> |