diff options
| author | Josh Bell <josh@lindenlab.com> | 2008-07-22 20:55:02 +0000 |
|---|---|---|
| committer | Josh Bell <josh@lindenlab.com> | 2008-07-22 20:55:02 +0000 |
| commit | 35b4a91129bc3da3476e7f9d8d8eb923a621cc3e (patch) | |
| tree | 2906124fe8371b6336e6f7231cd890d267a75d6d /indra/newview/llviewerobject.cpp | |
| parent | df4f20d4f51e41355e876f734527b4245543415c (diff) | |
svn merge -r92710:92709 svn+ssh://svn.lindenlab.com/svn/linden/release --> release
Undo r92710 (for QAR-698) - went straight into release instead of a side branch for validation.
Diffstat (limited to 'indra/newview/llviewerobject.cpp')
| -rw-r--r-- | indra/newview/llviewerobject.cpp | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp index 1aa7d2c3ff..19025b34a4 100644 --- a/indra/newview/llviewerobject.cpp +++ b/indra/newview/llviewerobject.cpp @@ -3039,7 +3039,7 @@ void LLViewerObject::updatePositionCaches() const const LLVector3d LLViewerObject::getPositionGlobal() const { - LLVector3d position_global = mRegionp->getPosGlobalFromRegion(getPositionRegion()); + LLVector3d position_global = mRegionp->getPosGlobalFromRegion(getPositionRegion());; if (isAttachment()) { @@ -3365,19 +3365,6 @@ LLViewerObject* LLViewerObject::getRootEdit() const return (LLViewerObject*)root; } - -BOOL LLViewerObject::lineSegmentIntersect(const LLVector3& start, const LLVector3& end, - S32 face, - S32* face_hit, - LLVector3* intersection, - LLVector2* tex_coord, - LLVector3* normal, - LLVector3* bi_normal) -{ - return false; -} - - U8 LLViewerObject::getMediaType() const { if (mMedia) @@ -4849,6 +4836,11 @@ BOOL LLViewerObject::setFlags(U32 flags, BOOL state) return setit; } +BOOL LLViewerObject::lineSegmentIntersect(const LLVector3& start, LLVector3& end) const +{ + return FALSE; +} + void LLViewerObject::applyAngularVelocity(F32 dt) { //do target omega here |