diff options
| author | Graham Madarasz <graham@lindenlab.com> | 2013-04-19 07:48:05 -0700 |
|---|---|---|
| committer | Graham Madarasz <graham@lindenlab.com> | 2013-04-19 07:48:05 -0700 |
| commit | 6adc6d71a7147a7f53f266bb05cd0157e34f9f4b (patch) | |
| tree | ad3b8886cd2c09cc1510db6a8c2e2e87ffafb441 /indra/newview/lldrawable.cpp | |
| parent | 8bccedd163f1eb25c631e8501bdd468c24e6bf40 (diff) | |
| parent | f9ff68b5e3b016a53fe987e5b51442741ca88f15 (diff) | |
Merge viewer-dev-materials
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 e9895a6e10..fe058cf094 100644 --- a/indra/newview/lldrawable.cpp +++ b/indra/newview/lldrawable.cpp @@ -484,7 +484,7 @@ void LLDrawable::makeActive() } llassert(isAvatar() || isRoot() || mParent->isActive()); - } +} void LLDrawable::makeStatic(BOOL warning_enabled) |