summaryrefslogtreecommitdiff
path: root/indra/newview/llspatialpartition.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2012-08-16 08:52:26 -0400
committerOz Linden <oz@lindenlab.com>2012-08-16 08:52:26 -0400
commita7d8b425097a7fab0a5a40d6a6b5770deb0bb7f9 (patch)
tree81e800d495674faa37d66c18db36cbfccd7fc5eb /indra/newview/llspatialpartition.cpp
parentdf93749819c503a66bc0ad34aeb1c7bed3746df2 (diff)
parentb9e43dfd646990be236e44814ce3199de3391dc1 (diff)
merge up to latest viewer-development
Diffstat (limited to 'indra/newview/llspatialpartition.cpp')
-rw-r--r--indra/newview/llspatialpartition.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llspatialpartition.cpp b/indra/newview/llspatialpartition.cpp
index 78c905f6ff..06c87e57fc 100644
--- a/indra/newview/llspatialpartition.cpp
+++ b/indra/newview/llspatialpartition.cpp
@@ -3498,6 +3498,8 @@ void renderPhysicsShapes(LLSpatialGroup* group)
LLViewerObject* object = drawable->getVObj();
if (object && object->getPCode() == LLViewerObject::LL_VO_SURFACE_PATCH)
{
+ gGL.pushMatrix();
+ gGL.multMatrix((F32*) object->getRegion()->mRenderMatrix.mMatrix);
//push face vertices for terrain
for (S32 i = 0; i < drawable->getNumFaces(); ++i)
{
@@ -3519,6 +3521,7 @@ void renderPhysicsShapes(LLSpatialGroup* group)
}
}
}
+ gGL.popMatrix();
}
}
}