aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment
diff options
context:
space:
mode:
authorMW2007-07-13 17:52:11 +0000
committerMW2007-07-13 17:52:11 +0000
commit07b0e2df6fadf6b2ce720a13d555028f03f73fe8 (patch)
tree8c49605b06948dc35707a5b817518714aeed53e5 /OpenSim/Region/Environment
parent* Moved LSL-style functions to ScriptInterpretedAPI.cs and put a XML remark c... (diff)
downloadopensim-SC_OLD-07b0e2df6fadf6b2ce720a13d555028f03f73fe8.zip
opensim-SC_OLD-07b0e2df6fadf6b2ce720a13d555028f03f73fe8.tar.gz
opensim-SC_OLD-07b0e2df6fadf6b2ce720a13d555028f03f73fe8.tar.bz2
opensim-SC_OLD-07b0e2df6fadf6b2ce720a13d555028f03f73fe8.tar.xz
Part two of Darok's Bullet physics plugin: added the actual plugin, although haven't added the project to prebuild.xml yet.
Also might have messed up some of the SVN properties on some of the folders, so if the cleaning lady has to come in again, I just hope she doesn't moan.
Diffstat (limited to 'OpenSim/Region/Environment')
-rw-r--r--OpenSim/Region/Environment/Scenes/Primitive.cs2
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs2
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Primitive.cs b/OpenSim/Region/Environment/Scenes/Primitive.cs
index 53314e3..ab50373 100644
--- a/OpenSim/Region/Environment/Scenes/Primitive.cs
+++ b/OpenSim/Region/Environment/Scenes/Primitive.cs
@@ -174,7 +174,7 @@ namespace OpenSim.Region.Environment.Scenes
174 dupe.Rotation = new Quaternion(this.Rotation.w, this.Rotation.x, this.Rotation.y, this.Rotation.z); 174 dupe.Rotation = new Quaternion(this.Rotation.w, this.Rotation.x, this.Rotation.y, this.Rotation.z);
175 dupe.Pos = new LLVector3(this.Pos.X, this.Pos.Y, this.Pos.Z); 175 dupe.Pos = new LLVector3(this.Pos.X, this.Pos.Y, this.Pos.Z);
176 rootParent.AddChildToList(dupe); 176 rootParent.AddChildToList(dupe);
177 177
178 foreach (Primitive prim in this.children) 178 foreach (Primitive prim in this.children)
179 { 179 {
180 Primitive primClone = prim.Copy(this, rootParent); 180 Primitive primClone = prim.Copy(this, rootParent);
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index c8714ae..0305b50 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -453,7 +453,7 @@ namespace OpenSim.Region.Environment.Scenes
453 453
454 } 454 }
455 455
456 protected override void SubscribeToClientEvents(IClientAPI client) 456 protected virtual void SubscribeToClientEvents(IClientAPI client)
457 { 457 {
458 client.OnRegionHandShakeReply += this.SendLayerData; 458 client.OnRegionHandShakeReply += this.SendLayerData;
459 //remoteClient.OnRequestWearables += new GenericCall(this.GetInitialPrims); 459 //remoteClient.OnRequestWearables += new GenericCall(this.GetInitialPrims);