diff options
| author | Chuck Linden <chuck@lindenlab.com> | 2010-02-17 12:59:00 -0500 |
|---|---|---|
| committer | Chuck Linden <chuck@lindenlab.com> | 2010-02-17 12:59:00 -0500 |
| commit | 52c4711ab0fce2444e6f89fcdd9898245f27a87d (patch) | |
| tree | af1780f2216a0dad0a0b9f196b140106ca65beae /indra/newview/llfloaterinventory.cpp | |
| parent | a383a38b0c1b5ae02cf8b8a3d5e6ccb3924b8766 (diff) | |
| parent | 33a3a0d156c3664dc9a61353c7b63f9343b0d1f5 (diff) | |
Automated merge with file:///Users/chuck/Documents/hg/viewer-hotfix
Diffstat (limited to 'indra/newview/llfloaterinventory.cpp')
| -rw-r--r-- | indra/newview/llfloaterinventory.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llfloaterinventory.cpp b/indra/newview/llfloaterinventory.cpp index e62e2c99a7..844f0ac509 100644 --- a/indra/newview/llfloaterinventory.cpp +++ b/indra/newview/llfloaterinventory.cpp @@ -41,6 +41,7 @@ #include "llpanelmaininventory.h" #include "llresmgr.h" #include "llviewerfoldertype.h" +#include "lltransientfloatermgr.h" ///---------------------------------------------------------------------------- /// LLFloaterInventory @@ -49,10 +50,12 @@ LLFloaterInventory::LLFloaterInventory(const LLSD& key) : LLFloater(key) { + LLTransientFloaterMgr::getInstance()->addControlView(this); } LLFloaterInventory::~LLFloaterInventory() { + LLTransientFloaterMgr::getInstance()->removeControlView(this); } BOOL LLFloaterInventory::postBuild() |