diff options
| author | simon <none@none> | 2013-05-14 09:17:25 -0700 |
|---|---|---|
| committer | simon <none@none> | 2013-05-14 09:17:25 -0700 |
| commit | 2722ed29c97e81447d88aea127abe0341683da44 (patch) | |
| tree | 382f74cbf7965f42ff0e0e2b795753d87e107fd2 /indra/newview/lldrawable.cpp | |
| parent | 8895e795763d14c3dae495b3648da3d4a52ba30a (diff) | |
| parent | 4dd245055f3417d8f8fb611a198ed5671dbce292 (diff) | |
Merge in latest viewer-beta
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) |