aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Serialization
diff options
context:
space:
mode:
authorMelanie2013-02-07 03:30:02 +0000
committerMelanie2013-02-07 03:30:02 +0000
commit6504e3d4cee1573115e8a83c06227a297a32f093 (patch)
treeca9196a2afb089cbce687d530e9743a1e995732f /OpenSim/Region/Framework/Scenes/Serialization
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
downloadopensim-SC-6504e3d4cee1573115e8a83c06227a297a32f093.zip
opensim-SC-6504e3d4cee1573115e8a83c06227a297a32f093.tar.gz
opensim-SC-6504e3d4cee1573115e8a83c06227a297a32f093.tar.bz2
opensim-SC-6504e3d4cee1573115e8a83c06227a297a32f093.tar.xz
Rename "Bounciness" to "Restitution"
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Serialization')
-rw-r--r--OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs6
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
index 78229fe..39420a6 100644
--- a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
+++ b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
@@ -618,7 +618,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
618 618
619 private static void ProcessBounce(SceneObjectPart obj, XmlTextReader reader) 619 private static void ProcessBounce(SceneObjectPart obj, XmlTextReader reader)
620 { 620 {
621 obj.Bounciness = reader.ReadElementContentAsFloat("Bounce", String.Empty); 621 obj.Restitution = reader.ReadElementContentAsFloat("Bounce", String.Empty);
622 } 622 }
623 623
624 private static void ProcessGravityModifier(SceneObjectPart obj, XmlTextReader reader) 624 private static void ProcessGravityModifier(SceneObjectPart obj, XmlTextReader reader)
@@ -1295,8 +1295,8 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
1295 writer.WriteElementString("Density", sop.Density.ToString().ToLower()); 1295 writer.WriteElementString("Density", sop.Density.ToString().ToLower());
1296 if (sop.Friction != 0.6f) 1296 if (sop.Friction != 0.6f)
1297 writer.WriteElementString("Friction", sop.Friction.ToString().ToLower()); 1297 writer.WriteElementString("Friction", sop.Friction.ToString().ToLower());
1298 if (sop.Bounciness != 0.5f) 1298 if (sop.Restitution != 0.5f)
1299 writer.WriteElementString("Bounce", sop.Bounciness.ToString().ToLower()); 1299 writer.WriteElementString("Bounce", sop.Restitution.ToString().ToLower());
1300 if (sop.GravityModifier != 1.0f) 1300 if (sop.GravityModifier != 1.0f)
1301 writer.WriteElementString("GravityModifier", sop.GravityModifier.ToString().ToLower()); 1301 writer.WriteElementString("GravityModifier", sop.GravityModifier.ToString().ToLower());
1302 1302