summaryrefslogtreecommitdiff
path: root/indra/newview/llpanelprofile.cpp
diff options
context:
space:
mode:
authorVadim ProductEngine <vsavchuk@productengine.com>2010-12-15 16:00:37 +0200
committerVadim ProductEngine <vsavchuk@productengine.com>2010-12-15 16:00:37 +0200
commit10d9328b86991272b6cbc7eda73e8f09afccfb52 (patch)
treec7a71e69d2e6f33ef55cf81ac52f34f7523ddac8 /indra/newview/llpanelprofile.cpp
parent27f3470b7ecff97e5e7798a3cf120260c209fc42 (diff)
STORM-786 ADDITIONAL FIX Fixed Windows build.
Diffstat (limited to 'indra/newview/llpanelprofile.cpp')
-rw-r--r--indra/newview/llpanelprofile.cpp11
1 files changed, 8 insertions, 3 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()