summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default
diff options
context:
space:
mode:
authorRichard Linden <none@none>2011-10-20 15:53:43 -0700
committerRichard Linden <none@none>2011-10-20 15:53:43 -0700
commit2cc4321166bfb6515a08fe1dd8053dae6d6840e3 (patch)
tree5d76a02618ba3bc4c8cc7066824b7b74ebe1e839 /indra/newview/skins/default
parent9560fb7cb2b0b542e7dbf028d40bda2cd9da05c5 (diff)
EXP-1423 FIX FUI resets floater contents after closing them (Inventory Panel), this is inconsistant for previous sidebar users and introduces extra difficulty in productivity of the viewer.
EXP-1430 FIX Minimizing voice settings floater corrupts layout throughout rest of session
Diffstat (limited to 'indra/newview/skins/default')
-rw-r--r--indra/newview/skins/default/xui/en/floater_my_inventory.xml2
-rw-r--r--indra/newview/skins/default/xui/en/floater_voice_controls.xml2
2 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_my_inventory.xml b/indra/newview/skins/default/xui/en/floater_my_inventory.xml
index 80718584e3..cd0b59dc51 100644
--- a/indra/newview/skins/default/xui/en/floater_my_inventory.xml
+++ b/indra/newview/skins/default/xui/en/floater_my_inventory.xml
@@ -10,7 +10,7 @@
name="floater_my_inventory"
save_rect="true"
save_visibility="true"
- reuse_instance="false"
+ reuse_instance="true"
title="INVENTORY"
width="333" >
<panel
diff --git a/indra/newview/skins/default/xui/en/floater_voice_controls.xml b/indra/newview/skins/default/xui/en/floater_voice_controls.xml
index 14a722e3be..93a04050b6 100644
--- a/indra/newview/skins/default/xui/en/floater_voice_controls.xml
+++ b/indra/newview/skins/default/xui/en/floater_voice_controls.xml
@@ -52,6 +52,7 @@
user_resize="false"
auto_resize="false"
layout="topleft"
+ min_height="20"
height="20"
name="my_panel">
<avatar_icon
@@ -133,6 +134,7 @@
height="132"
name="callers_panel"
user_resize="false"
+ auto_resize="true"
width="280">
<avatar_list
follows="all"