Skip to content
Snippets Groups Projects
Commit 8c938913 authored by Paul Guslisty's avatar Paul Guslisty
Browse files

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