diff options
| author | Roxie Linden <roxie@lindenlab.com> | 2010-12-08 21:27:03 -0800 |
|---|---|---|
| committer | Roxie Linden <roxie@lindenlab.com> | 2010-12-08 21:27:03 -0800 |
| commit | a5ae6f0141a6f80cd21ab4f583fc9f1b5264c5a4 (patch) | |
| tree | 979cf6697a27f09072bf404a471a4712c2dca912 /indra/newview/llspatialpartition.cpp | |
| parent | a1e59112d028469870c7d1b38c8dbb56f556959d (diff) | |
| parent | 1be5133116c7e63bc621a4017bedaebf557c83db (diff) | |
automated merge
Diffstat (limited to 'indra/newview/llspatialpartition.cpp')
| -rw-r--r-- | indra/newview/llspatialpartition.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llspatialpartition.cpp b/indra/newview/llspatialpartition.cpp index bd6be14341..6b77209867 100644 --- a/indra/newview/llspatialpartition.cpp +++ b/indra/newview/llspatialpartition.cpp @@ -2900,7 +2900,7 @@ void renderPhysicsShape(LLDrawable* drawable, LLVOVolume* volume) LLVolumeParams volume_params = volume->getVolume()->getParams(); - LLPhysicsVolumeParams physics_params(volume->getVolume()->getParams(), + LLPhysicsVolumeParams physics_params(volume_params, physics_type == LLViewerObject::PHYSICS_SHAPE_CONVEX_HULL); LLPhysicsShapeBuilderUtil::PhysicsShapeSpecification physics_spec; |