summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerobject.h
diff options
context:
space:
mode:
authorBryan O'Sullivan <bos@lindenlab.com>2009-06-29 11:43:20 -0700
committerBryan O'Sullivan <bos@lindenlab.com>2009-06-29 11:43:20 -0700
commit87918b4bfe27ddcba2e4a44323ebc85e509a92fc (patch)
treee37cc81e7b6292750941e767d33910fd95f20bb6 /indra/newview/llviewerobject.h
parentb74af1c2aa4d8804a240135f54df7d3c21ce3ab6 (diff)
parentcb8641a639d077fe03853e69be597ee359f5a01f (diff)
Merge with viewer-2.0.0-3
Diffstat (limited to 'indra/newview/llviewerobject.h')
-rw-r--r--indra/newview/llviewerobject.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llviewerobject.h b/indra/newview/llviewerobject.h
index 21a99c58d9..2b2c2d5a95 100644
--- a/indra/newview/llviewerobject.h
+++ b/indra/newview/llviewerobject.h
@@ -64,6 +64,7 @@ class LLWorld;
class LLNameValue;
class LLNetMap;
class LLMessageSystem;
+class LLPartSysData;
class LLPrimitive;
class LLPipeline;
class LLTextureEntry;
@@ -236,7 +237,7 @@ public:
BOOL isProbablyModifiable() const;
*/
- virtual void setParent(LLViewerObject* parent);
+ virtual BOOL setParent(LLViewerObject* parent);
virtual void addChild(LLViewerObject *childp);
virtual void removeChild(LLViewerObject *childp);
const_child_list_t& getChildren() const { return mChildList; }