aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.Inventory.cs4
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPart.cs16
2 files changed, 13 insertions, 7 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index 816d3b6..8a26df1 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -300,6 +300,10 @@ namespace OpenSim.Region.Framework.Scenes
300 AssetBase asset = CreateAsset(item.Name, item.Description, (sbyte)AssetType.LSLText, data, remoteClient.AgentId); 300 AssetBase asset = CreateAsset(item.Name, item.Description, (sbyte)AssetType.LSLText, data, remoteClient.AgentId);
301 AssetService.Store(asset); 301 AssetService.Store(asset);
302 302
303// m_log.DebugFormat(
304// "[PRIM INVENTORY]: Stored asset {0} when updating item {1} in prim {2} for {3}",
305// asset.ID, item.Name, part.Name, remoteClient.Name);
306
303 if (isScriptRunning) 307 if (isScriptRunning)
304 { 308 {
305 part.Inventory.RemoveScriptInstance(item.ItemID, false); 309 part.Inventory.RemoveScriptInstance(item.ItemID, false);
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 4bec2d4..f911ef8 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -3321,10 +3321,10 @@ namespace OpenSim.Region.Framework.Scenes
3321 3321
3322 public void SetVehicleFlags(int param, bool remove) 3322 public void SetVehicleFlags(int param, bool remove)
3323 { 3323 {
3324 if (PhysActor != null) 3324 PhysicsActor pa = PhysActor;
3325 { 3325
3326 PhysActor.VehicleFlags(param, remove); 3326 if (pa != null)
3327 } 3327 pa.VehicleFlags(param, remove);
3328 } 3328 }
3329 3329
3330 public void SetGroup(UUID groupID, IClientAPI client) 3330 public void SetGroup(UUID groupID, IClientAPI client)
@@ -3356,10 +3356,12 @@ namespace OpenSim.Region.Framework.Scenes
3356 3356
3357 public void SetPhysicsAxisRotation() 3357 public void SetPhysicsAxisRotation()
3358 { 3358 {
3359 if (PhysActor != null) 3359 PhysicsActor pa = PhysActor;
3360
3361 if (pa != null)
3360 { 3362 {
3361 PhysActor.LockAngularMotion(RotationAxis); 3363 pa.LockAngularMotion(RotationAxis);
3362 ParentGroup.Scene.PhysicsScene.AddPhysicsActorTaint(PhysActor); 3364 ParentGroup.Scene.PhysicsScene.AddPhysicsActorTaint(pa);
3363 } 3365 }
3364 } 3366 }
3365 3367