Fixed low bug EXT - 4751 (VCP hides while avatar inspector in use)

- Updated an Avatar Inspector to register / unregister itself in the Transient Floater Manager

--HG--
branch : product-engine
meow-7.2.2
Paul Guslisty 2010-02-18 11:06:12 +02:00
parent ba39810721
commit 8c93891366
1 changed files with 9 additions and 1 deletions

View File

@ -51,6 +51,7 @@
#include "llviewermenu.h"
#include "llvoiceclient.h"
#include "llviewerobjectlist.h"
#include "lltransientfloatermgr.h"
// Linden libraries
#include "llfloater.h"
@ -71,7 +72,7 @@ class LLFetchAvatarData;
// Avatar Inspector, a small information window used when clicking
// on avatar names in the 2D UI and in the ambient inspector widget for
// the 3D world.
class LLInspectAvatar : public LLInspect
class LLInspectAvatar : public LLInspect, LLTransientFloater
{
friend class LLFloaterReg;
@ -97,6 +98,8 @@ public:
// gear menu is not open
/* virtual */ void onMouseLeave(S32 x, S32 y, MASK mask);
virtual LLTransientFloaterMgr::ETransientGroup getGroup() { return LLTransientFloaterMgr::GLOBAL; }
private:
// Make network requests for all the data to display in this view.
// Used on construction and if avatar id changes.
@ -237,6 +240,9 @@ LLInspectAvatar::LLInspectAvatar(const LLSD& sd)
// can't make the properties request until the widgets are constructed
// as it might return immediately, so do it in postBuild.
LLTransientFloaterMgr::getInstance()->addControlView(LLTransientFloaterMgr::GLOBAL, this);
LLTransientFloater::init(this);
}
LLInspectAvatar::~LLInspectAvatar()
@ -245,6 +251,8 @@ LLInspectAvatar::~LLInspectAvatar()
// view
delete mPropertiesRequest;
mPropertiesRequest = NULL;
LLTransientFloaterMgr::getInstance()->removeControlView(this);
}
/*virtual*/