summaryrefslogtreecommitdiff
path: root/indra/newview/llvovolume.h
diff options
context:
space:
mode:
authorXiaohong Bao <bao@lindenlab.com>2009-06-27 01:05:56 +0000
committerXiaohong Bao <bao@lindenlab.com>2009-06-27 01:05:56 +0000
commitcb8641a639d077fe03853e69be597ee359f5a01f (patch)
treef6f76a534fc45fd4a2bbdface46d62cc5d6237f6 /indra/newview/llvovolume.h
parent6f613fb70ff28ee090dc0871b461a62bd2aa0d08 (diff)
fix for DEV-27483/SEC-283: Viewer crash: LLXform::setParent Creating loop when setting parent
Diffstat (limited to 'indra/newview/llvovolume.h')
-rw-r--r--indra/newview/llvovolume.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llvovolume.h b/indra/newview/llvovolume.h
index f20e551671..5d7b373b3c 100644
--- a/indra/newview/llvovolume.h
+++ b/indra/newview/llvovolume.h
@@ -107,7 +107,7 @@ public:
/*virtual*/ BOOL isHUDAttachment() const;
void generateSilhouette(LLSelectNode* nodep, const LLVector3& view_point);
- /*virtual*/ void setParent(LLViewerObject* parent);
+ /*virtual*/ BOOL setParent(LLViewerObject* parent);
S32 getLOD() const { return mLOD; }
const LLVector3 getPivotPositionAgent() const;
const LLMatrix4& getRelativeXform() const { return mRelativeXform; }