diff options
| author | William Todd Stinson <stinson@lindenlab.com> | 2012-11-09 18:51:23 -0800 |
|---|---|---|
| committer | William Todd Stinson <stinson@lindenlab.com> | 2012-11-09 18:51:23 -0800 |
| commit | c9044c03b3157c330a0b3b640bfce6bacc0c9343 (patch) | |
| tree | d22f74cf380629ef398eea71d937646bfd726a40 /indra/newview/lldrawable.cpp | |
| parent | 1786a7150e754ea10dfd5172ec2491dd67e83a9a (diff) | |
| parent | 8a3384adafff1b34d5a903e4d8cfd2dabca9e243 (diff) | |
Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta.
Diffstat (limited to 'indra/newview/lldrawable.cpp')
| -rw-r--r-- | indra/newview/lldrawable.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/lldrawable.cpp b/indra/newview/lldrawable.cpp index 954fd429a5..1107c3ecd1 100644 --- a/indra/newview/lldrawable.cpp +++ b/indra/newview/lldrawable.cpp @@ -433,7 +433,7 @@ void LLDrawable::makeActive() } llassert(isAvatar() || isRoot() || mParent->isActive()); -} + } void LLDrawable::makeStatic(BOOL warning_enabled) @@ -447,7 +447,7 @@ void LLDrawable::makeStatic(BOOL warning_enabled) //drawable became static with active parent, not acceptable llassert(mParent.isNull() || !mParent->isActive() || !warning_enabled); - + LLViewerObject::const_child_list_t& child_list = mVObjp->getChildren(); for (LLViewerObject::child_list_t::const_iterator iter = child_list.begin(); iter != child_list.end(); iter++) |