diff options
| author | Roxie Linden <roxie@lindenlab.com> | 2010-12-09 22:00:01 -0800 |
|---|---|---|
| committer | Roxie Linden <roxie@lindenlab.com> | 2010-12-09 22:00:01 -0800 |
| commit | 52686947e2643eaa0f1cda03f33bbf1089d3b46d (patch) | |
| tree | 0ac1953df5a44fde129ead1f5d7c3e91eea4bc90 /indra/newview/llspatialpartition.cpp | |
| parent | db1af2445dac667eb24c69d005509b8ff007cc9e (diff) | |
| parent | d8695e8d657568d0ebf6b63ad9cadad7e225afc7 (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; |