diff options
| -rw-r--r-- | indra/newview/llpanelprofile.cpp | 11 | ||||
| -rw-r--r-- | indra/newview/llpanelprofile.h | 3 |
2 files changed, 10 insertions, 4 deletions
diff --git a/indra/newview/llpanelprofile.cpp b/indra/newview/llpanelprofile.cpp index f4e8392916..b035d7d473 100644 --- a/indra/newview/llpanelprofile.cpp +++ b/indra/newview/llpanelprofile.cpp @@ -115,10 +115,15 @@ LLAgentHandler gAgentHandler; //-- LLPanelProfile::ChildStack begins ---------------------------------------- -LLPanelProfile::ChildStack::ChildStack(LLPanel* parent) -: mParent(parent) +LLPanelProfile::ChildStack::ChildStack() +: mParent(NULL) +{ +} + +void LLPanelProfile::ChildStack::setParent(LLPanel* parent) { llassert_always(parent != NULL); + mParent = parent; } /// Save current parent's child views and remove them from the child list. @@ -209,9 +214,9 @@ void LLPanelProfile::ChildStack::dump() LLPanelProfile::LLPanelProfile() : LLPanel() , mTabCtrl(NULL) - , mChildStack(this) , mAvatarId(LLUUID::null) { + mChildStack.setParent(this); } BOOL LLPanelProfile::postBuild() diff --git a/indra/newview/llpanelprofile.h b/indra/newview/llpanelprofile.h index 577b71f284..0a572e6f25 100644 --- a/indra/newview/llpanelprofile.h +++ b/indra/newview/llpanelprofile.h @@ -75,7 +75,8 @@ private: { LOG_CLASS(LLPanelProfile::ChildStack); public: - ChildStack(LLPanel* parent); + ChildStack(); + void setParent(LLPanel* parent); bool push(); bool pop(); |