diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-07-08 12:06:28 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-07-08 12:06:28 -0400 |
| commit | c2817b0d532af0c6af2b2b62084fd5c5cbab8140 (patch) | |
| tree | e9f4fea1de2a30e22d644c43f865c6230bde9cfb /indra/newview/lldrawable.cpp | |
| parent | 6c440d1b51fcd73d56e96ceb8a285282a6a242ef (diff) | |
| parent | b8e67899650b487f3e716366624eb74dc5f490b2 (diff) | |
merge up to integration repo
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 |