From 10d9328b86991272b6cbc7eda73e8f09afccfb52 Mon Sep 17 00:00:00 2001
From: Vadim ProductEngine <vsavchuk@productengine.com>
Date: Wed, 15 Dec 2010 16:00:37 +0200
Subject: [PATCH] STORM-786 ADDITIONAL FIX Fixed Windows build.
---
indra/newview/llpanelprofile.cpp | 11 ++++++++---
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 f4e8392916e..b035d7d4733 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 577b71f2841..0a572e6f25a 100644
--- a/indra/newview/llpanelprofile.h
+++ b/indra/newview/llpanelprofile.h
@@ -75,7 +75,8 @@ class LLPanelProfile : public LLPanel
{
LOG_CLASS(LLPanelProfile::ChildStack);
public:
- ChildStack(LLPanel* parent);
+ ChildStack();
+ void setParent(LLPanel* parent);
bool push();
bool pop();
--
GitLab