summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerobjectlist.h
diff options
context:
space:
mode:
authorRichard Linden <none@none>2013-04-12 14:27:25 -0700
committerRichard Linden <none@none>2013-04-12 14:27:25 -0700
commit1ddad3737977b9e750c4d1815ea99b51e75f18aa (patch)
tree140d51925a3cd2fbca3677ff293fc2d37b051759 /indra/newview/llviewerobjectlist.h
parent54d7fc95893d1bf8cc3b6ebe94f3bf37f40125d0 (diff)
parent8db22a591645a3a7c3308827ca819bc2415692d8 (diff)
Automated merge with ssh://hg.lindenlab.com/richard/viewer-interesting-metrics
Diffstat (limited to 'indra/newview/llviewerobjectlist.h')
-rw-r--r--indra/newview/llviewerobjectlist.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewerobjectlist.h b/indra/newview/llviewerobjectlist.h
index cb11ef1f5e..a7a4969768 100644
--- a/indra/newview/llviewerobjectlist.h
+++ b/indra/newview/llviewerobjectlist.h
@@ -72,7 +72,7 @@ public:
LLViewerObject *replaceObject(const LLUUID &id, const LLPCode pcode, LLViewerRegion *regionp); // TomY: hack to switch VO instances on the fly
- BOOL killObject(LLViewerObject *objectp, bool cache_enabled = false);
+ BOOL killObject(LLViewerObject *objectp);
void killObjects(LLViewerRegion *regionp); // Kill all objects owned by a particular region.
void killAllObjects();
void removeDrawable(LLDrawable* drawablep);