aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/Scene.cs
diff options
context:
space:
mode:
authorlbsa712007-11-30 08:08:14 +0000
committerlbsa712007-11-30 08:08:14 +0000
commitd2b1b54f497b9d401958806b433559dbbb9fa4fa (patch)
tree870e65ce7c0067ddda0c1c6a7011fdefa4c5bc68 /OpenSim/Region/Environment/Scenes/Scene.cs
parent* Extended our semi-stupid implementation of in world object permissions to s... (diff)
downloadopensim-SC_OLD-d2b1b54f497b9d401958806b433559dbbb9fa4fa.zip
opensim-SC_OLD-d2b1b54f497b9d401958806b433559dbbb9fa4fa.tar.gz
opensim-SC_OLD-d2b1b54f497b9d401958806b433559dbbb9fa4fa.tar.bz2
opensim-SC_OLD-d2b1b54f497b9d401958806b433559dbbb9fa4fa.tar.xz
* Removed permissions flag appliance from Xml deserialization
* Various code convention compliance
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/Scene.cs')
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index cc0f3e1..f2eb486 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -765,7 +765,7 @@ namespace OpenSim.Region.Environment.Scenes
765 new PhysicsVector(rootPart.Scale.X, rootPart.Scale.Y, rootPart.Scale.Z), 765 new PhysicsVector(rootPart.Scale.X, rootPart.Scale.Y, rootPart.Scale.Z),
766 new Quaternion(rootPart.RotationOffset.W, rootPart.RotationOffset.X, 766 new Quaternion(rootPart.RotationOffset.W, rootPart.RotationOffset.X,
767 rootPart.RotationOffset.Y, rootPart.RotationOffset.Z), UsePhysics); 767 rootPart.RotationOffset.Y, rootPart.RotationOffset.Z), UsePhysics);
768 rootPart.doPhysicsPropertyUpdate(UsePhysics, true); 768 rootPart.DoPhysicsPropertyUpdate(UsePhysics, true);
769 } 769 }
770 MainLog.Instance.Verbose("Loaded " + PrimsFromDB.Count.ToString() + " SceneObject(s)"); 770 MainLog.Instance.Verbose("Loaded " + PrimsFromDB.Count.ToString() + " SceneObject(s)");
771 } 771 }
@@ -869,7 +869,7 @@ namespace OpenSim.Region.Environment.Scenes
869 new PhysicsVector(shape.Scale.X, shape.Scale.Y, shape.Scale.Z), 869 new PhysicsVector(shape.Scale.X, shape.Scale.Y, shape.Scale.Z),
870 new Quaternion(), UsePhysics); 870 new Quaternion(), UsePhysics);
871 // subscribe to physics events. 871 // subscribe to physics events.
872 rootPart.doPhysicsPropertyUpdate(UsePhysics, true); 872 rootPart.DoPhysicsPropertyUpdate(UsePhysics, true);
873 873
874 } 874 }
875 } 875 }