summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llinventorypanel.cpp5
-rw-r--r--indra/newview/skins/default/xui/en/panel_outfits_inventory.xml2
-rw-r--r--indra/newview/skins/default/xui/en/sidepanel_appearance.xml17
3 files changed, 14 insertions, 10 deletions
diff --git a/indra/newview/llinventorypanel.cpp b/indra/newview/llinventorypanel.cpp
index 0bdad791a7..082b7a9468 100644
--- a/indra/newview/llinventorypanel.cpp
+++ b/indra/newview/llinventorypanel.cpp
@@ -402,9 +402,12 @@ void LLInventoryPanel::modelChanged(U32 mask)
// static
void LLInventoryPanel::onIdle(void *userdata)
{
+ if (!gInventory.isInventoryUsable())
+ return;
+
LLInventoryPanel *self = (LLInventoryPanel*)userdata;
// Inventory just initialized, do complete build
- if (!self->mViewsInitialized && gInventory.isInventoryUsable())
+ if (!self->mViewsInitialized)
{
self->initializeViews();
}
diff --git a/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml b/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml
index 5c99022f35..d6d8e9562b 100644
--- a/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml
@@ -3,7 +3,7 @@
<panel name="Outfits"
background_visible="true"
follows="all"
- height="550"
+ height="570"
label="Things"
layout="topleft"
min_height="350"
diff --git a/indra/newview/skins/default/xui/en/sidepanel_appearance.xml b/indra/newview/skins/default/xui/en/sidepanel_appearance.xml
index 7f4b4aef82..44248eedd5 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_appearance.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_appearance.xml
@@ -2,23 +2,24 @@
<panel
background_visible="true"
follows="all"
-height="635"
+height="570"
label="Outfits"
layout="topleft"
-min_height="460"
+min_height="350"
+min_width="240"
name="appearance panel"
top="0"
left="0"
- width="333">
+width="333">
<string
name="No Outfit"
value="No Outfit" />
<panel
left="0"
top="0"
- follows="left|top|right"
+ follows="all"
layout="topleft"
- width="333"
+ width="330"
height="33"
name="panel_currentlook"
>
@@ -85,9 +86,9 @@ left="0"
class="panel_outfits_inventory"
filename="panel_outfits_inventory.xml"
name="panel_outfits_inventory"
- height="550"
- min_height="510"
- width="333"
+ height="515"
+ min_height="410"
+ width="320"
top_pad="0"
follows="all"
/>