livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

STORM-786 ADDITIONAL FIX Fixed Windows build.

meow-7.2.2
Vadim ProductEngine 2010-12-15 16:00:37 +02:00
parent 27f3470b7e
commit 10d9328b86
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
indra/newview/llpanelprofile.cpp
View File

@ -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()

3
indra/newview/llpanelprofile.h
View File

@ -75,7 +75,8 @@ private:
{
LOG_CLASS(LLPanelProfile::ChildStack);
public:
ChildStack(LLPanel* parent);
ChildStack();
void setParent(LLPanel* parent);
bool push();
bool pop();