diff options
| author | Dave Parks <davep@lindenlab.com> | 2013-07-03 11:53:48 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2013-07-03 11:53:48 -0500 |
| commit | c4d6c4213f263456fc48be468cb5596c35ccd6ec (patch) | |
| tree | 55debaaeb48b155c24b439e568899ec50e4da609 /indra/newview/lldrawable.cpp | |
| parent | 4f2c25979488733bcf92bc2f6ec357618c3e9632 (diff) | |
| parent | 930de04f51212195a2c7a877d235d4106f4d37e2 (diff) | |
Automated merge with https://bitbucket.org/lindenlab/viewer-development-materials
Diffstat (limited to 'indra/newview/lldrawable.cpp')
| -rwxr-xr-x | indra/newview/lldrawable.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/lldrawable.cpp b/indra/newview/lldrawable.cpp index 8c9fd4152a..2a333157f2 100755 --- a/indra/newview/lldrawable.cpp +++ b/indra/newview/lldrawable.cpp @@ -527,6 +527,8 @@ void LLDrawable::makeStatic(BOOL warning_enabled) } updatePartition(); } + + llassert(isAvatar() || isRoot() || mParent->isStatic()); } // Returns "distance" between target destination and resulting xfrom |