diff options
| author | Merov Linden <merov@lindenlab.com> | 2011-02-25 15:39:01 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2011-02-25 15:39:01 -0800 |
| commit | b9c6c9d273780ed055696472e16c6aeb5426f6de (patch) | |
| tree | d4e31c5929b7bc507a52201ebe5a5e761182d537 | |
| parent | 0a397313f5b795f8e78624820d998a638896b547 (diff) | |
| parent | 06c1fede783ef3d9279411547e34c5d23c28fed7 (diff) | |
STORM-979 : pull into viewer-development
| -rw-r--r-- | doc/contributions.txt | 5 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/sidepanel_inventory.xml | 36 |
2 files changed, 22 insertions, 19 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index 5d59627a92..116cae2b6b 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -392,10 +392,13 @@ Jonathan Yap STORM-812 STORM-829 STORM-844 + STORM-953 + STORM-960 STORM-869 + STORM-975 + STORM-979 VWR-17801 VWR-24347 - STORM-975 Kage Pixel VWR-11 Ken March diff --git a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml index f3c6895cee..8997c1a6d7 100644 --- a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml +++ b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml @@ -37,7 +37,7 @@ name="button_panel" left="9" top_pad="-2" - width="313"> + width="308"> <layout_stack follows="bottom|left|right" height="23" @@ -47,7 +47,7 @@ left="0" orientation="horizontal" top="0" - width="313"> + width="308"> <layout_panel follows="bottom|left|right" height="23" @@ -57,7 +57,7 @@ name="info_btn_lp" user_resize="false" auto_resize="true" - width="103"> + width="101"> <button enabled="true" follows="bottom|left|right" @@ -68,62 +68,62 @@ name="info_btn" tool_tip="Show object profile" top="0" - width="102" /> + width="100" /> </layout_panel> <layout_panel follows="bottom|left|right" height="23" layout="bottomleft" - left_pad="3" + left_pad="1" mouse_opaque="false" name="share_btn_lp" user_resize="false" auto_resize="true" - width="102"> + width="100"> <button enabled="true" follows="bottom|left|right" height="23" label="Share" layout="topleft" - left="0" + left="1" name="share_btn" tool_tip="Share an inventory item" top="0" - width="102" /> + width="99" /> </layout_panel> <layout_panel follows="bottom|left|right" height="23" layout="bottomleft" - left_pad="3" + left_pad="1" mouse_opaque="false" name="shop_btn_lp" user_resize="false" auto_resize="true" - width="102"> + width="100"> <button enabled="true" follows="bottom|left|right" height="23" label="Shop" layout="topleft" - left="0" + left="1" name="shop_btn" tool_tip="Open Marketplace webpage" top="0" - width="102" /> + width="99" /> <button enabled="false" follows="bottom|left|right" height="23" label="Wear" layout="topleft" - left="0" + left="1" name="wear_btn" tool_tip="Wear seleceted outfit" top="0" - width="102" /> + width="99" /> <button enabled="false" follows="bottom|left|right" @@ -131,20 +131,20 @@ label="Play" layout="topleft" name="play_btn" - left="0" + left="1" top="0" - width="102" /> + width="99" /> <button enabled="false" follows="bottom|left|right" height="23" label="Teleport" layout="topleft" - left="0" + left="1" name="teleport_btn" tool_tip="Teleport to the selected area" top="0" - width="102" /> + width="99" /> </layout_panel> </layout_stack> </panel> |