diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-08-28 13:05:07 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-08-28 13:05:07 -0400 |
| commit | 5b799244c31b7517328f875ebda033ac734933a4 (patch) | |
| tree | 7fd7dde3c0c46474ae8f25c8ca53f6897a73a067 | |
| parent | 306b2d810effdc677194f4db26c906a59e7386ff (diff) | |
| parent | 0092ec9bd96410f54a82040647f9c361550cde51 (diff) | |
merge changes for storm-1929
| -rwxr-xr-x | doc/contributions.txt | 1 | ||||
| -rwxr-xr-x | indra/newview/skins/default/xui/en/panel_status_bar.xml | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index 56968ce3f6..848a5d7574 100755 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -667,6 +667,7 @@ Jonathan Yap STORM-1858 STORM-1862 STORM-1918 + STORM-1929 STORM-1953 OPEN-161 STORM-1953 diff --git a/indra/newview/skins/default/xui/en/panel_status_bar.xml b/indra/newview/skins/default/xui/en/panel_status_bar.xml index dd2a0c6627..064ece6e4b 100755 --- a/indra/newview/skins/default/xui/en/panel_status_bar.xml +++ b/indra/newview/skins/default/xui/en/panel_status_bar.xml @@ -113,7 +113,7 @@ image_pressed="Pause_Press" image_pressed_selected="Play_Press" is_toggle="true" - left_pad="15" + left_pad="5" top="1" name="media_toggle_btn" tool_tip="Start/Stop All Media (Music, Video, Web pages)" |