aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
diff options
context:
space:
mode:
authorlbsa712007-11-29 15:27:57 +0000
committerlbsa712007-11-29 15:27:57 +0000
commit7704bb6f63f608df79fee2c3dcea7d5deabeee17 (patch)
tree63ece08049e04720639f1396d8d7ca6597e5089a /OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
parent* Thanks to _SomeOne_, Server side permissions on object editing. Be aware, ... (diff)
downloadopensim-SC-7704bb6f63f608df79fee2c3dcea7d5deabeee17.zip
opensim-SC-7704bb6f63f608df79fee2c3dcea7d5deabeee17.tar.gz
opensim-SC-7704bb6f63f608df79fee2c3dcea7d5deabeee17.tar.bz2
opensim-SC-7704bb6f63f608df79fee2c3dcea7d5deabeee17.tar.xz
* Fixed neighbour range bug
* Various refactorings
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.Inventory.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
index 3c8dc0a..52d0f1c 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
@@ -429,7 +429,7 @@ namespace OpenSim.Region.Environment.Scenes
429 SceneObjectPart rootPart = (group).GetChildPart(group.UUID); 429 SceneObjectPart rootPart = (group).GetChildPart(group.UUID);
430 if (rootPart.PhysActor != null) 430 if (rootPart.PhysActor != null)
431 { 431 {
432 phyScene.RemovePrim(rootPart.PhysActor); 432 PhysicsScene.RemovePrim(rootPart.PhysActor);
433 rootPart.PhysActor = null; 433 rootPart.PhysActor = null;
434 } 434 }
435 435
@@ -482,7 +482,7 @@ namespace OpenSim.Region.Environment.Scenes
482 if ((rootPart.ObjectFlags & (uint) LLObject.ObjectFlags.Phantom) == 0) 482 if ((rootPart.ObjectFlags & (uint) LLObject.ObjectFlags.Phantom) == 0)
483 { 483 {
484 PrimitiveBaseShape pbs = rootPart.Shape; 484 PrimitiveBaseShape pbs = rootPart.Shape;
485 rootPart.PhysActor = phyScene.AddPrimShape( 485 rootPart.PhysActor = PhysicsScene.AddPrimShape(
486 rootPart.Name, 486 rootPart.Name,
487 pbs, 487 pbs,
488 new PhysicsVector(rootPart.AbsolutePosition.X, rootPart.AbsolutePosition.Y, 488 new PhysicsVector(rootPart.AbsolutePosition.X, rootPart.AbsolutePosition.Y,