aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Data/MySQL/MySQLSimulationData.cs4
-rw-r--r--OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs2
-rw-r--r--OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs2
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPart.cs6
-rw-r--r--OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs6
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs4
6 files changed, 12 insertions, 12 deletions
diff --git a/OpenSim/Data/MySQL/MySQLSimulationData.cs b/OpenSim/Data/MySQL/MySQLSimulationData.cs
index 01b9299..d5a4f46 100644
--- a/OpenSim/Data/MySQL/MySQLSimulationData.cs
+++ b/OpenSim/Data/MySQL/MySQLSimulationData.cs
@@ -1339,7 +1339,7 @@ namespace OpenSim.Data.MySQL
1339 prim.Density = (float)(double)row["Density"]; 1339 prim.Density = (float)(double)row["Density"];
1340 prim.GravityModifier = (float)(double)row["GravityModifier"]; 1340 prim.GravityModifier = (float)(double)row["GravityModifier"];
1341 prim.Friction = (float)(double)row["Friction"]; 1341 prim.Friction = (float)(double)row["Friction"];
1342 prim.Bounciness = (float)(double)row["Restitution"]; 1342 prim.Restitution = (float)(double)row["Restitution"];
1343 1343
1344 SOPVehicle vehicle = null; 1344 SOPVehicle vehicle = null;
1345 1345
@@ -1725,7 +1725,7 @@ namespace OpenSim.Data.MySQL
1725 cmd.Parameters.AddWithValue("Density", (double)prim.Density); 1725 cmd.Parameters.AddWithValue("Density", (double)prim.Density);
1726 cmd.Parameters.AddWithValue("GravityModifier", (double)prim.GravityModifier); 1726 cmd.Parameters.AddWithValue("GravityModifier", (double)prim.GravityModifier);
1727 cmd.Parameters.AddWithValue("Friction", (double)prim.Friction); 1727 cmd.Parameters.AddWithValue("Friction", (double)prim.Friction);
1728 cmd.Parameters.AddWithValue("Restitution", (double)prim.Bounciness); 1728 cmd.Parameters.AddWithValue("Restitution", (double)prim.Restitution);
1729 1729
1730 if (prim.VehicleParams != null) 1730 if (prim.VehicleParams != null)
1731 cmd.Parameters.AddWithValue("Vehicle", prim.VehicleParams.ToXml2()); 1731 cmd.Parameters.AddWithValue("Vehicle", prim.VehicleParams.ToXml2());
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
index b06788b..2bb3d38 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
@@ -1317,7 +1317,7 @@ namespace OpenSim.Region.ClientStack.Linden
1317 object_data["PhysicsShapeType"] = obj.PhysicsShapeType; 1317 object_data["PhysicsShapeType"] = obj.PhysicsShapeType;
1318 object_data["Density"] = obj.Density; 1318 object_data["Density"] = obj.Density;
1319 object_data["Friction"] = obj.Friction; 1319 object_data["Friction"] = obj.Friction;
1320 object_data["Restitution"] = obj.Bounciness; 1320 object_data["Restitution"] = obj.Restitution;
1321 object_data["GravityMultiplier"] = obj.GravityModifier; 1321 object_data["GravityMultiplier"] = obj.GravityModifier;
1322 1322
1323 resp[uuid.ToString()] = object_data; 1323 resp[uuid.ToString()] = object_data;
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index f2b0160..ca15e3e 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -2654,7 +2654,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
2654 byte physshapetype = part.PhysicsShapeType; 2654 byte physshapetype = part.PhysicsShapeType;
2655 float density = part.Density; 2655 float density = part.Density;
2656 float friction = part.Friction; 2656 float friction = part.Friction;
2657 float bounce = part.Bounciness; 2657 float bounce = part.Restitution;
2658 float gravmod = part.GravityModifier; 2658 float gravmod = part.GravityModifier;
2659 2659
2660 eq.partPhysicsProperties(localid, physshapetype, density, friction, bounce, gravmod,AgentId); 2660 eq.partPhysicsProperties(localid, physshapetype, density, friction, bounce, gravmod,AgentId);
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 8528edc..0d2da03 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -1729,7 +1729,7 @@ namespace OpenSim.Region.Framework.Scenes
1729 } 1729 }
1730 } 1730 }
1731 1731
1732 public float Bounciness 1732 public float Restitution
1733 { 1733 {
1734 get { return m_bounce; } 1734 get { return m_bounce; }
1735 set 1735 set
@@ -4493,8 +4493,8 @@ namespace OpenSim.Region.Framework.Scenes
4493 GravityModifier = physdata.GravitationModifier; 4493 GravityModifier = physdata.GravitationModifier;
4494 if(Friction != physdata.Friction) 4494 if(Friction != physdata.Friction)
4495 Friction = physdata.Friction; 4495 Friction = physdata.Friction;
4496 if(Bounciness != physdata.Bounce) 4496 if(Restitution != physdata.Bounce)
4497 Bounciness = physdata.Bounce; 4497 Restitution = physdata.Bounce;
4498 } 4498 }
4499 /// <summary> 4499 /// <summary>
4500 /// Update the flags on this prim. This covers properties such as phantom, physics and temporary. 4500 /// Update the flags on this prim. This covers properties such as phantom, physics and temporary.
diff --git a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
index 123c158..2984782 100644
--- a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
+++ b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
@@ -633,7 +633,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
633 633
634 private static void ProcessBounce(SceneObjectPart obj, XmlTextReader reader) 634 private static void ProcessBounce(SceneObjectPart obj, XmlTextReader reader)
635 { 635 {
636 obj.Bounciness = reader.ReadElementContentAsFloat("Bounce", String.Empty); 636 obj.Restitution = reader.ReadElementContentAsFloat("Bounce", String.Empty);
637 } 637 }
638 638
639 private static void ProcessGravityModifier(SceneObjectPart obj, XmlTextReader reader) 639 private static void ProcessGravityModifier(SceneObjectPart obj, XmlTextReader reader)
@@ -1363,8 +1363,8 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
1363 writer.WriteElementString("Density", sop.Density.ToString().ToLower()); 1363 writer.WriteElementString("Density", sop.Density.ToString().ToLower());
1364 if (sop.Friction != 0.6f) 1364 if (sop.Friction != 0.6f)
1365 writer.WriteElementString("Friction", sop.Friction.ToString().ToLower()); 1365 writer.WriteElementString("Friction", sop.Friction.ToString().ToLower());
1366 if (sop.Bounciness != 0.5f) 1366 if (sop.Restitution != 0.5f)
1367 writer.WriteElementString("Bounce", sop.Bounciness.ToString().ToLower()); 1367 writer.WriteElementString("Bounce", sop.Restitution.ToString().ToLower());
1368 if (sop.GravityModifier != 1.0f) 1368 if (sop.GravityModifier != 1.0f)
1369 writer.WriteElementString("GravityModifier", sop.GravityModifier.ToString().ToLower()); 1369 writer.WriteElementString("GravityModifier", sop.GravityModifier.ToString().ToLower());
1370 WriteVector(writer, "CameraEyeOffset", sop.GetCameraEyeOffset()); 1370 WriteVector(writer, "CameraEyeOffset", sop.GetCameraEyeOffset());
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 01a649b..6685764 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -7845,7 +7845,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
7845 physdata.PhysShapeType = (PhysShapeType)part.PhysicsShapeType; 7845 physdata.PhysShapeType = (PhysShapeType)part.PhysicsShapeType;
7846 physdata.Density = part.Density; 7846 physdata.Density = part.Density;
7847 physdata.Friction = part.Friction; 7847 physdata.Friction = part.Friction;
7848 physdata.Bounce = part.Bounciness; 7848 physdata.Bounce = part.Restitution;
7849 physdata.GravitationModifier = part.GravityModifier; 7849 physdata.GravitationModifier = part.GravityModifier;
7850 7850
7851 if ((material_bits & (int)ScriptBaseClass.DENSITY) != 0) 7851 if ((material_bits & (int)ScriptBaseClass.DENSITY) != 0)
@@ -8238,7 +8238,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
8238 8238
8239 ExtraPhysicsData physdata = new ExtraPhysicsData(); 8239 ExtraPhysicsData physdata = new ExtraPhysicsData();
8240 physdata.Density = part.Density; 8240 physdata.Density = part.Density;
8241 physdata.Bounce = part.Bounciness; 8241 physdata.Bounce = part.Restitution;
8242 physdata.GravitationModifier = part.GravityModifier; 8242 physdata.GravitationModifier = part.GravityModifier;
8243 physdata.PhysShapeType = (PhysShapeType)shape_type; 8243 physdata.PhysShapeType = (PhysShapeType)shape_type;
8244 8244