diff options
| author | Don Kjer <don@lindenlab.com> | 2011-05-17 21:01:36 +0000 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2011-05-17 21:01:36 +0000 |
| commit | 0a86e39d90e06f0a690b1ff5caf2dee5fe347f8f (patch) | |
| tree | c0e4f0df907c3f876dafdab3caa83e9356434fa9 /indra/newview/llviewerpartsim.cpp | |
| parent | ae8ed3fc2d4a7dda92ad8fdb34bc559478eb9177 (diff) | |
| parent | 79459bc9ba8cefa67091e65dd676f50c9ddc612d (diff) | |
Merge with viewer-development (mesh)
Diffstat (limited to 'indra/newview/llviewerpartsim.cpp')
| -rw-r--r-- | indra/newview/llviewerpartsim.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llviewerpartsim.cpp b/indra/newview/llviewerpartsim.cpp index 4fee85e45c..6b3e04348a 100644 --- a/indra/newview/llviewerpartsim.cpp +++ b/indra/newview/llviewerpartsim.cpp @@ -155,8 +155,8 @@ LLViewerPartGroup::LLViewerPartGroup(const LLVector3 ¢er_agent, const F32 bo if (group != NULL) { - LLVector3 center(group->mOctreeNode->getCenter()); - LLVector3 size(group->mOctreeNode->getSize()); + LLVector3 center(group->mOctreeNode->getCenter().getF32ptr()); + LLVector3 size(group->mOctreeNode->getSize().getF32ptr()); size += LLVector3(0.01f, 0.01f, 0.01f); mMinObjPos = center - size; mMaxObjPos = center + size; |
