diff options
| author | Rick Pasetto <rick@lindenlab.com> | 2010-01-06 17:37:28 -0800 | 
|---|---|---|
| committer | Rick Pasetto <rick@lindenlab.com> | 2010-01-06 17:37:28 -0800 | 
| commit | 3b32253d31aaede1093833cebd47e3e74a410af4 (patch) | |
| tree | fb70ae0bf8be150eacad8efd9dddd9625bd88017 | |
| parent | bffbd93b067131bb7f1526e159ea9997983eef88 (diff) | |
| parent | 93dc1cd3b040ef0d7edd314ca2c23dfb827e829b (diff) | |
Automated merge with ssh://rick@hg.lindenlab.com/viewer/viewer-2-0/
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_prim_media_controls.xml | 2 | 
1 files changed, 1 insertions, 1 deletions
| diff --git a/indra/newview/skins/default/xui/en/panel_prim_media_controls.xml b/indra/newview/skins/default/xui/en/panel_prim_media_controls.xml index 4cef1f9c60..f44b377b0f 100644 --- a/indra/newview/skins/default/xui/en/panel_prim_media_controls.xml +++ b/indra/newview/skins/default/xui/en/panel_prim_media_controls.xml @@ -14,7 +14,7 @@    <string name="min_width">300</string>    <string name="min_height">75</string>    <string name="zoom_near_padding">1.0</string> -  <string name="zoom_medium_padding">1.25</string> +  <string name="zoom_medium_padding">1.1</string>    <string name="zoom_far_padding">1.5</string>    <string name="top_world_view_avoid_zone">50</string>    <layout_stack | 
