summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexei Arabadji <aarabadji@productengine.com>2010-02-17 12:00:20 +0200
committerAlexei Arabadji <aarabadji@productengine.com>2010-02-17 12:00:20 +0200
commitaeffc8a3de966832b748dbd98a27f48b3c5a4e3a (patch)
treed11a76358dd2be1f59661625ab0be7a5b45976e6
parent09a509e0073a1daa5eadf1b5bf5bdef24080ab47 (diff)
fixed major EXT-5439 “IM window vanishes when trying to drag notecard to IM chat bar with second inventory window open”,
added LLFloaterInventory to global group of transient exception list(the same as for side tray); --HG-- branch : product-engine
-rw-r--r--indra/newview/llfloaterinventory.cpp3
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()