summaryrefslogtreecommitdiff
path: root/indra/newview/lldrawable.cpp
diff options
context:
space:
mode:
authorGeenz <geenz@geenzo.com>2013-04-18 23:11:38 -0400
committerGeenz <geenz@geenzo.com>2013-04-18 23:11:38 -0400
commit9e53724538d61e6e53f5bf56e01760d59b54f690 (patch)
treeac494bb773e15f5b59bb3a6fffac0a5f913ce40b /indra/newview/lldrawable.cpp
parentb6a6479c372e311b45e27eafd368e2045ca21790 (diff)
parent509c35d5bae7dbd938198c3e038011932693ff36 (diff)
Merged with latest viewer-development-materials.
Diffstat (limited to 'indra/newview/lldrawable.cpp')
-rw-r--r--indra/newview/lldrawable.cpp2
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)