summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterinventory.cpp
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/llfloaterinventory.cpp
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/llfloaterinventory.cpp')
-rw-r--r--indra/newview/llfloaterinventory.cpp9
1 files changed, 9 insertions, 0 deletions
diff --git a/indra/newview/llfloaterinventory.cpp b/indra/newview/llfloaterinventory.cpp
index df769bdd88..9b9b90e521 100644
--- a/indra/newview/llfloaterinventory.cpp
+++ b/indra/newview/llfloaterinventory.cpp
@@ -98,3 +98,12 @@ void LLFloaterInventory::onOpen(const LLSD& key)
{
//LLFirstUse::useInventory();
}
+
+void LLFloaterInventory::onClose(bool app_quitting)
+{
+ LLFloater::onClose(app_quitting);
+ if (mKey.asInteger() > 1)
+ {
+ destroy();
+ }
+}