diff options
| author | Graham Linden <graham@lindenlab.com> | 2013-07-03 10:43:37 -0700 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2013-07-03 10:43:37 -0700 |
| commit | 37c9fcb3dac80a41c88bba8fbd992bf08b3d2ac7 (patch) | |
| tree | d945cbd946088868e652d86bb6cb928c1a9a2109 /indra/newview/lldrawable.cpp | |
| parent | ed3b5184990822162840e1e7611d338a880e67a6 (diff) | |
| parent | c4d6c4213f263456fc48be468cb5596c35ccd6ec (diff) | |
Merge vwr-dev-mat
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 |