From ca026ac735e50ac4294b030db69b2cfcbc59c55b Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Sun, 29 Nov 2015 00:19:25 +0000 Subject: [PATCH] fix the default shape type on upload, it is always convex --- .../Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs index 1236e83da5..b61959d7e7 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs @@ -1028,9 +1028,7 @@ namespace OpenSim.Region.ClientStack.Linden // for now viwers do send fixed defaults // but this may change // int physicsShapeType = inner_instance_list["physics_shape_type"].AsInteger(); - byte physicsShapeType = (byte)PhysShapeType.prim; // default for mesh is simple convex - if(hasmesh) - physicsShapeType = (byte) PhysShapeType.convex; // default for mesh is simple convex + byte physicsShapeType = (byte)PhysShapeType.convex; // default is simple convex // int material = inner_instance_list["material"].AsInteger(); byte material = (byte)Material.Wood;