Skip to content
Snippets Groups Projects
Commit d18c46bc authored by Alexei Arabadji's avatar Alexei Arabadji
Browse files

win build fixed

--HG--
branch : product-engine
parent 74429f2e
No related branches found
No related tags found
No related merge requests found
...@@ -39,9 +39,10 @@ ...@@ -39,9 +39,10 @@
LLTransientDockableFloater::LLTransientDockableFloater(LLDockControl* dockControl, bool uniqueDocking, LLTransientDockableFloater::LLTransientDockableFloater(LLDockControl* dockControl, bool uniqueDocking,
const LLSD& key, const Params& params) : const LLSD& key, const Params& params) :
LLDockableFloater(dockControl, uniqueDocking, key, params), LLTransientFloater(this) LLDockableFloater(dockControl, uniqueDocking, key, params)
{ {
LLTransientFloaterMgr::getInstance()->registerTransientFloater(this); LLTransientFloaterMgr::getInstance()->registerTransientFloater(this);
LLTransientFloater::init(this);
} }
LLTransientDockableFloater::~LLTransientDockableFloater() LLTransientDockableFloater::~LLTransientDockableFloater()
......
...@@ -139,3 +139,9 @@ void LLTransientFloaterMgr::leftMouseClickCallback(S32 x, S32 y, ...@@ -139,3 +139,9 @@ void LLTransientFloaterMgr::leftMouseClickCallback(S32 x, S32 y,
} }
} }
void LLTransientFloater::init(LLFloater* thiz)
{
// used since LLTransientFloater(this) can't be used in descendant constructor parameter initialization.
mFloater = thiz;
}
...@@ -75,8 +75,13 @@ class LLTransientFloaterMgr: public LLSingleton<LLTransientFloaterMgr> ...@@ -75,8 +75,13 @@ class LLTransientFloaterMgr: public LLSingleton<LLTransientFloaterMgr>
*/ */
class LLTransientFloater class LLTransientFloater
{ {
protected:
/**
* Class initialization method.
* Should be called from descendant constructor.
*/
void init(LLFloater* thiz);
public: public:
LLTransientFloater(LLFloater* floater) : mFloater(floater) {}
virtual LLTransientFloaterMgr::ETransientGroup getGroup() = 0; virtual LLTransientFloaterMgr::ETransientGroup getGroup() = 0;
bool isTransientDocked() { return mFloater->isDocked(); }; bool isTransientDocked() { return mFloater->isDocked(); };
void setTransientVisible(BOOL visible) {mFloater->setVisible(visible); } void setTransientVisible(BOOL visible) {mFloater->setVisible(visible); }
......
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