diff options
| author | Dave Parks <davep@lindenlab.com> | 2013-05-09 15:40:32 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2013-05-09 15:40:32 -0500 |
| commit | 50bbb0b7ed542a5f9dee4f347531537beecddd26 (patch) | |
| tree | 619d276c935c7db2ff3cecd6bb41808c82e6b479 /indra/newview/lldrawable.cpp | |
| parent | cd8e0b92e1c8f9f8544b1011e61c21c7789b93b7 (diff) | |
| parent | be9f71d16660e37fb058ddf05f20e6a80a272862 (diff) | |
Automated merge with https://bitbucket.org/lindenlab/viewer-cat
Diffstat (limited to 'indra/newview/lldrawable.cpp')
| -rw-r--r-- | indra/newview/lldrawable.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/lldrawable.cpp b/indra/newview/lldrawable.cpp index 2e3a9119b8..31ab37f970 100644 --- a/indra/newview/lldrawable.cpp +++ b/indra/newview/lldrawable.cpp @@ -441,7 +441,7 @@ void LLDrawable::makeActive() } llassert(isAvatar() || isRoot() || mParent->isActive()); - } +} void LLDrawable::makeStatic(BOOL warning_enabled) |