Skip to content
Snippets Groups Projects
Commit 10d9328b authored by Vadim ProductEngine's avatar Vadim ProductEngine
Browse files

STORM-786 ADDITIONAL FIX Fixed Windows build.

parent 27f3470b
No related branches found
No related tags found
No related merge requests found
...@@ -115,10 +115,15 @@ LLAgentHandler gAgentHandler; ...@@ -115,10 +115,15 @@ LLAgentHandler gAgentHandler;
//-- LLPanelProfile::ChildStack begins ---------------------------------------- //-- LLPanelProfile::ChildStack begins ----------------------------------------
LLPanelProfile::ChildStack::ChildStack(LLPanel* parent) LLPanelProfile::ChildStack::ChildStack()
: mParent(parent) : mParent(NULL)
{
}
void LLPanelProfile::ChildStack::setParent(LLPanel* parent)
{ {
llassert_always(parent != NULL); llassert_always(parent != NULL);
mParent = parent;
} }
/// Save current parent's child views and remove them from the child list. /// Save current parent's child views and remove them from the child list.
...@@ -209,9 +214,9 @@ void LLPanelProfile::ChildStack::dump() ...@@ -209,9 +214,9 @@ void LLPanelProfile::ChildStack::dump()
LLPanelProfile::LLPanelProfile() LLPanelProfile::LLPanelProfile()
: LLPanel() : LLPanel()
, mTabCtrl(NULL) , mTabCtrl(NULL)
, mChildStack(this)
, mAvatarId(LLUUID::null) , mAvatarId(LLUUID::null)
{ {
mChildStack.setParent(this);
} }
BOOL LLPanelProfile::postBuild() BOOL LLPanelProfile::postBuild()
......
...@@ -75,7 +75,8 @@ class LLPanelProfile : public LLPanel ...@@ -75,7 +75,8 @@ class LLPanelProfile : public LLPanel
{ {
LOG_CLASS(LLPanelProfile::ChildStack); LOG_CLASS(LLPanelProfile::ChildStack);
public: public:
ChildStack(LLPanel* parent); ChildStack();
void setParent(LLPanel* parent);
bool push(); bool push();
bool pop(); bool pop();
......
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