diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2013-06-24 23:37:48 -0600 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2013-06-24 23:37:48 -0600 |
| commit | e6e82b5b3559fd792997407bf84df1fb61fa0c17 (patch) | |
| tree | 6072c9ef9ea449f3db74a066fcbd69cca9c973c5 /indra/newview/llviewerobject.cpp | |
| parent | 9f58b3ccbdb9e73e1faec6ec5cfa3bfeec1fd581 (diff) | |
| parent | eb8d0bed7b8b068231efc6c0c30b719b4c171c7f (diff) | |
Automated merge with http://bitbucket.org/lindenlab/viewer-interesting
Diffstat (limited to 'indra/newview/llviewerobject.cpp')
| -rwxr-xr-x | indra/newview/llviewerobject.cpp | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp index 5ae08a8b9e..4e514ddfd1 100755 --- a/indra/newview/llviewerobject.cpp +++ b/indra/newview/llviewerobject.cpp @@ -1026,11 +1026,6 @@ U32 LLViewerObject::extractSpatialExtents(LLDataPackerBinaryBuffer *dp, LLVector { U32 parent_id = 0; LLViewerObject::unpackParentID(dp, parent_id); - if(parent_id > 0) - { - //is a child, no need to decode further. - return parent_id; - } LLViewerObject::unpackVector3(dp, scale, "Scale"); LLViewerObject::unpackVector3(dp, pos, "Pos"); |