aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment
diff options
context:
space:
mode:
authorlbsa712008-02-20 09:38:45 +0000
committerlbsa712008-02-20 09:38:45 +0000
commit9be5f9d6cce5f447294b478ab6c71fa7a520ffad (patch)
treeea09a501a177ed611e37999c8c97505a5b1c6f5f /OpenSim/Region/Environment
parent* Caught 'OPTIONS' verb in BaseHttpServer that would otherwise explode. (diff)
downloadopensim-SC_OLD-9be5f9d6cce5f447294b478ab6c71fa7a520ffad.zip
opensim-SC_OLD-9be5f9d6cce5f447294b478ab6c71fa7a520ffad.tar.gz
opensim-SC_OLD-9be5f9d6cce5f447294b478ab6c71fa7a520ffad.tar.bz2
opensim-SC_OLD-9be5f9d6cce5f447294b478ab6c71fa7a520ffad.tar.xz
* Fixed xml loading bug (the xml was scheduled for update before added to a scene)
* Fixed ClickAction situation on the same note (properties shouldn't cause big changes) * Added some more debug output to AssetCache
Diffstat (limited to 'OpenSim/Region/Environment')
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs2
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectPart.cs1
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneXmlLoader.cs5
3 files changed, 3 insertions, 5 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
index 91b9a61..b13a702 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
@@ -352,8 +352,6 @@ namespace OpenSim.Region.Environment.Scenes
352 sr.Close(); 352 sr.Close();
353 353
354 UpdateParentIDs(); 354 UpdateParentIDs();
355
356 ScheduleGroupForFullUpdate();
357 } 355 }
358 356
359 private void AttachToBackup() 357 private void AttachToBackup()
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
index a522380..650f549 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
@@ -543,7 +543,6 @@ namespace OpenSim.Region.Environment.Scenes
543 set 543 set
544 { 544 {
545 m_clickAction = value; 545 m_clickAction = value;
546 ScheduleFullUpdate();
547 } 546 }
548 } 547 }
549 548
diff --git a/OpenSim/Region/Environment/Scenes/SceneXmlLoader.cs b/OpenSim/Region/Environment/Scenes/SceneXmlLoader.cs
index 4982613..2b05bb6 100644
--- a/OpenSim/Region/Environment/Scenes/SceneXmlLoader.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneXmlLoader.cs
@@ -193,9 +193,10 @@ namespace OpenSim.Region.Environment.Scenes
193 new Quaternion(rootPart.RotationOffset.W, rootPart.RotationOffset.X, 193 new Quaternion(rootPart.RotationOffset.W, rootPart.RotationOffset.X,
194 rootPart.RotationOffset.Y, rootPart.RotationOffset.Z), UsePhysics); 194 rootPart.RotationOffset.Y, rootPart.RotationOffset.Z), UsePhysics);
195 rootPart.DoPhysicsPropertyUpdate(UsePhysics, true); 195 rootPart.DoPhysicsPropertyUpdate(UsePhysics, true);
196 rootPart.Velocity = receivedVelocity; 196 rootPart.Velocity = receivedVelocity;
197
198 } 197 }
198
199 obj.ScheduleGroupForFullUpdate();
199 } 200 }
200 201
201 public void SavePrimsToXml2(string fileName) 202 public void SavePrimsToXml2(string fileName)