diff options
author | Todd Stinson <stinson@lindenlab.com> | 2012-08-09 17:04:00 -0700 |
---|---|---|
committer | Todd Stinson <stinson@lindenlab.com> | 2012-08-09 17:04:00 -0700 |
commit | 268d5bd4bd4c9311053808b1f7aa74a85aa038a5 (patch) | |
tree | e777c21cf2a9e1d2a115c96bff080ebe2d0edb31 /indra/newview/llspatialpartition.cpp | |
parent | ce417a01c9a5cb0befc68533734d98023a03b96e (diff) | |
parent | 337976096530729a7d671df68907cd59a7986972 (diff) |
Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-development.
Diffstat (limited to 'indra/newview/llspatialpartition.cpp')
-rw-r--r-- | indra/newview/llspatialpartition.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llspatialpartition.cpp b/indra/newview/llspatialpartition.cpp index 44d32f7d93..e62c9c3da5 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(); } } } |