summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterinventory.cpp
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2011-10-27 14:52:17 -0400
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2011-10-27 14:52:17 -0400
commit1e70d53b198e15a85138a8f0ebdf6f77f070f916 (patch)
tree49d58bf6cd6584834b6e91688ad8bfb34bd38cff /indra/newview/llfloaterinventory.cpp
parent0c84957d312bc3dc31fdb5711317157df73b72e6 (diff)
parent1b173ed82b65c7bb5f5d5294847a721b64f8cf35 (diff)
merge
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();
+ }
+}