diff options
author | Richard Linden <none@none> | 2013-01-11 10:27:03 -0800 |
---|---|---|
committer | Richard Linden <none@none> | 2013-01-11 10:27:03 -0800 |
commit | 17c051f965e05a8a91d4a93b641084869897fe71 (patch) | |
tree | 1227bfab5e2039b2d78061adbd549e8481ce4fdc /indra/newview/llviewerpartsim.cpp | |
parent | 62a9f557d2e91beb685843775e8f9fe73dab4b94 (diff) | |
parent | efa6be575c184a885d2b7e6f2142db6777668343 (diff) |
Automated merge with file:///c:%5Ccode%5Cviewer-interesting-metrics
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 6bd9f66b9c..8acdc08b00 100644 --- a/indra/newview/llviewerpartsim.cpp +++ b/indra/newview/llviewerpartsim.cpp @@ -151,8 +151,8 @@ LLViewerPartGroup::LLViewerPartGroup(const LLVector3 ¢er_agent, const F32 bo if (group != NULL) { - LLVector3 center(group->mOctreeNode->getCenter().getF32ptr()); - LLVector3 size(group->mOctreeNode->getSize().getF32ptr()); + LLVector3 center(group->getOctreeNode()->getCenter().getF32ptr()); + LLVector3 size(group->getOctreeNode()->getSize().getF32ptr()); size += LLVector3(0.01f, 0.01f, 0.01f); mMinObjPos = center - size; mMaxObjPos = center + size; |