Skip to content
Snippets Groups Projects
Commit 5b799244 authored by Oz Linden's avatar Oz Linden
Browse files

merge changes for storm-1929

parents 306b2d81 0092ec9b
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
doc/contributions.txt
+ 1
− 0
View file @ 5b799244
......@@ -667,6 +667,7 @@ Jonathan Yap
STORM-1858
STORM-1862
STORM-1918
STORM-1929
STORM-1953
OPEN-161
STORM-1953
......
indra/newview/skins/default/xui/en/panel_status_bar.xml
+ 1
− 1
View file @ 5b799244
......@@ -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)"
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment