diff options
author | Logan Dethrow <log@lindenlab.com> | 2011-11-18 10:45:40 -0500 |
---|---|---|
committer | Logan Dethrow <log@lindenlab.com> | 2011-11-18 10:45:40 -0500 |
commit | 3819c3b049abb0771c7129c0a11a8fcd0725f9fd (patch) | |
tree | f0bb1432b1ae475c7d844f278b668e1d76193e96 /indra/newview/llfloaterinventory.cpp | |
parent | 620b63a31667d93d9186217eb355d05e71ff245c (diff) | |
parent | 4bcdcd02fb7e83a2754084f2fb599b56ea6c8743 (diff) |
Merge
Diffstat (limited to 'indra/newview/llfloaterinventory.cpp')
-rw-r--r-- | indra/newview/llfloaterinventory.cpp | 9 |
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(); + } +} |