diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2013-03-18 16:56:02 -0600 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2013-03-18 16:56:02 -0600 |
| commit | 47c608becb629e368a1b227ab30299df7155effd (patch) | |
| tree | 562962646f6ec4463a56d32005b3b5251190130e /indra/newview/llviewerobjectlist.h | |
| parent | 9a81945eac31f41848cd48a5ba18dee4949f2d03 (diff) | |
| parent | bdf562036a8ce864bf211b7696b1d74334030f4b (diff) | |
Merge
Diffstat (limited to 'indra/newview/llviewerobjectlist.h')
| -rw-r--r-- | indra/newview/llviewerobjectlist.h | 2 |
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); |