summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default
diff options
context:
space:
mode:
authorLeyla Farazha <leyla@lindenlab.com>2011-08-18 11:04:34 -0700
committerLeyla Farazha <leyla@lindenlab.com>2011-08-18 11:04:34 -0700
commit5891d0218614851e88e31763ec24490b63b6aec5 (patch)
tree57a759586c89a09408f0b4f1f7dfe7690a1c01eb /indra/newview/skins/default
parent6d7523defcc5a78e8db9e4ea9db6605247c289ae (diff)
EXP-1095: "Oubox scroll goes off viewer window with a large number of items in outbox"
Diffstat (limited to 'indra/newview/skins/default')
-rw-r--r--indra/newview/skins/default/xui/en/sidepanel_inventory.xml4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
index 613e662e1a..1d0fb58a73 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
@@ -171,7 +171,7 @@
class="panel_marketplace_outbox"
top="0"
label=""
- height="200"
+ height="35"
width="330">
<string name="OutboxLabelWithArg">Merchant Outbox ([NUM])</string>
<string name="OutboxLabelNoArg">Merchant Outbox</string>
@@ -250,7 +250,7 @@
top="0"
left="0"
width="308"
- height="165"
+ height="0"
wrap="true"
halign="center">
Set up your merchant account to use this feature.