diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-05-10 12:56:25 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-05-10 12:56:25 -0400 |
| commit | 199086fadae619f175850748701cc0ac921695ac (patch) | |
| tree | b437c920cb8fe3f1b186b44d4648ad3539283108 /indra/newview/lldrawable.cpp | |
| parent | 33d9adfa9a07e0bf6f6ebd8213e843048ec92392 (diff) | |
| parent | f6519afee0b9630e770905e90bb2896c8b49c20d (diff) | |
merge changes for MAINT-2647
Diffstat (limited to 'indra/newview/lldrawable.cpp')
| -rwxr-xr-x | 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 bb1d263670..47306d3a6a 100755 --- 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) |