aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/Linden
diff options
context:
space:
mode:
authorMelanie2012-03-13 20:49:16 +0100
committerMelanie2012-03-13 20:49:16 +0100
commitd4e6834f99db25ad0461cec72b58876fa299844b (patch)
tree684269ff13963d87a7a82a7cc2423636a65ea1eb /OpenSim/Region/ClientStack/Linden
parentMerge branch 'ubitwork' (diff)
downloadopensim-SC_OLD-d4e6834f99db25ad0461cec72b58876fa299844b.zip
opensim-SC_OLD-d4e6834f99db25ad0461cec72b58876fa299844b.tar.gz
opensim-SC_OLD-d4e6834f99db25ad0461cec72b58876fa299844b.tar.bz2
opensim-SC_OLD-d4e6834f99db25ad0461cec72b58876fa299844b.tar.xz
Hook up the new cap to the SOP changes
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden')
-rw-r--r--OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs13
1 files changed, 5 insertions, 8 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
index 2974058..df65af9 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
@@ -820,14 +820,11 @@ namespace OpenSim.Region.ClientStack.Linden
820 { 820 {
821 OSDMap object_data = new OSDMap(); 821 OSDMap object_data = new OSDMap();
822 822
823 object_data["PhysicsShapeType"] = OSD.FromInteger(1); 823 object_data["PhysicsShapeType"] = obj.PhysicsShapeType;
824 if (false) // Check whether to include the rest 824 object_data["Density"] = obj.Density;
825 { 825 object_data["Friction"] = obj.Friction;
826 object_data["Density"] = OSD.FromReal(1); 826 object_data["Restitution"] = obj.Bounciness;
827 object_data["Friction"] = OSD.FromReal(1); 827 object_data["GravityMultiplier"] = obj.GravityModifier;
828 object_data["Restitution"] = OSD.FromReal(1);
829 object_data["GravityMultiplier"] = OSD.FromReal(1);
830 }
831 828
832 resp[uuid.ToString()] = object_data; 829 resp[uuid.ToString()] = object_data;
833 } 830 }