Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

I suppose actually including llvoavatar.cpp would help too...

Browse Source
This commit is contained in:
Shyotl
2014-09-09 21:56:53 -05:00
parent e95c0a4631
commit df2ca052ea
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
indra/newview/llvoavatar.cpp
View File

@@ -1799,10 +1799,10 @@ void LLVOAvatar::renderCollisionVolumes()
{ {
std::ostringstream ostr; std::ostringstream ostr;
LLGLDepthTest gls_depth(GL_FALSE); LLGLDepthTest gls_depth(GL_FALSE);
for (S32 i = 0; i < mNumCollisionVolumes; i++) for (S32 i = 0; i < (S32)mCollisionVolumes.size(); i++)
{ {
mCollisionVolumes[i].renderCollision(); mCollisionVolumes[i]->renderCollision();
ostr << mCollisionVolumes[i].getName() << ", "; ostr << mCollisionVolumes[i]->getName() << ", ";
} }
if (mNameText.notNull()) if (mNameText.notNull())
@@ -1920,11 +1920,11 @@ BOOL LLVOAvatar::lineSegmentIntersect(const LLVector4a& start, const LLVector4a&
if (lineSegmentBoundingBox(start, end)) if (lineSegmentBoundingBox(start, end))
{ {
for (S32 i = 0; i < mNumCollisionVolumes; ++i) for (S32 i = 0; i < (S32)mCollisionVolumes.size(); ++i)
{ {
mCollisionVolumes[i].updateWorldMatrix(); mCollisionVolumes[i]->updateWorldMatrix();
const LLMatrix4a& mat = mCollisionVolumes[i].getXform()->getWorldMatrix(); const LLMatrix4a& mat = mCollisionVolumes[i]->getXform()->getWorldMatrix();
LLMatrix4a inverse = mat; LLMatrix4a inverse = mat;
inverse.invert(); inverse.invert();
LLMatrix4a norm_mat = inverse; LLMatrix4a norm_mat = inverse;