aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r--OpenSim/Region/Framework/Scenes/SOPVehicle.cs3
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs7
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs8
3 files changed, 14 insertions, 4 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SOPVehicle.cs b/OpenSim/Region/Framework/Scenes/SOPVehicle.cs
index 41e8944..9cb901a 100644
--- a/OpenSim/Region/Framework/Scenes/SOPVehicle.cs
+++ b/OpenSim/Region/Framework/Scenes/SOPVehicle.cs
@@ -36,7 +36,6 @@ using System.Xml;
36using OpenSim.Framework.Serialization; 36using OpenSim.Framework.Serialization;
37using OpenSim.Framework.Serialization.External; 37using OpenSim.Framework.Serialization.External;
38using OpenSim.Region.Framework.Scenes.Serialization; 38using OpenSim.Region.Framework.Scenes.Serialization;
39using OpenSim.Region.Framework.Scenes.Serialization;
40 39
41namespace OpenSim.Region.Framework.Scenes 40namespace OpenSim.Region.Framework.Scenes
42{ 41{
@@ -215,7 +214,7 @@ namespace OpenSim.Region.Framework.Scenes
215 switch (pParam) 214 switch (pParam)
216 { 215 {
217 case Vehicle.REFERENCE_FRAME: 216 case Vehicle.REFERENCE_FRAME:
218 vd.m_referenceFrame = Quaternion.Inverse(pValue); 217 vd.m_referenceFrame = pValue;
219 break; 218 break;
220 } 219 }
221 }//end ProcessRotationVehicleParam 220 }//end ProcessRotationVehicleParam
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 19f319c..f437bc8 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -879,6 +879,8 @@ namespace OpenSim.Region.Framework.Scenes
879 StatsReporter = new SimStatsReporter(this); 879 StatsReporter = new SimStatsReporter(this);
880 StatsReporter.OnSendStatsResult += SendSimStatsPackets; 880 StatsReporter.OnSendStatsResult += SendSimStatsPackets;
881 StatsReporter.OnStatsIncorrect += m_sceneGraph.RecalculateStats; 881 StatsReporter.OnStatsIncorrect += m_sceneGraph.RecalculateStats;
882
883 MainConsole.Instance.Commands.AddCommand("scene", false, "gc collect", "gc collect", "gc collect", "Cause the garbage collector to make a single pass", HandleGcCollect);
882 } 884 }
883 885
884 public Scene(RegionInfo regInfo) : base(regInfo) 886 public Scene(RegionInfo regInfo) : base(regInfo)
@@ -5773,5 +5775,10 @@ Environment.Exit(1);
5773 m_SpawnPoint = 1; 5775 m_SpawnPoint = 1;
5774 return m_SpawnPoint - 1; 5776 return m_SpawnPoint - 1;
5775 } 5777 }
5778
5779 private void HandleGcCollect(string module, string[] args)
5780 {
5781 GC.Collect();
5782 }
5776 } 5783 }
5777} 5784}
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index 33a2cc5..f1f94a7 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -2061,8 +2061,6 @@ namespace OpenSim.Region.Framework.Scenes
2061 HasGroupChangedDueToDelink = false; 2061 HasGroupChangedDueToDelink = false;
2062 2062
2063 m_scene.EventManager.TriggerOnSceneObjectPreSave(backup_group, this); 2063 m_scene.EventManager.TriggerOnSceneObjectPreSave(backup_group, this);
2064 datastore.StoreObject(backup_group, m_scene.RegionInfo.RegionID);
2065
2066 backup_group.ForEachPart(delegate(SceneObjectPart part) 2064 backup_group.ForEachPart(delegate(SceneObjectPart part)
2067 { 2065 {
2068 if (part.KeyframeMotion != null) 2066 if (part.KeyframeMotion != null)
@@ -2070,6 +2068,12 @@ namespace OpenSim.Region.Framework.Scenes
2070 part.KeyframeMotion = KeyframeMotion.FromData(backup_group, part.KeyframeMotion.Serialize()); 2068 part.KeyframeMotion = KeyframeMotion.FromData(backup_group, part.KeyframeMotion.Serialize());
2071 part.KeyframeMotion.UpdateSceneObject(this); 2069 part.KeyframeMotion.UpdateSceneObject(this);
2072 } 2070 }
2071 });
2072
2073 datastore.StoreObject(backup_group, m_scene.RegionInfo.RegionID);
2074
2075 backup_group.ForEachPart(delegate(SceneObjectPart part)
2076 {
2073 part.Inventory.ProcessInventoryBackup(datastore); 2077 part.Inventory.ProcessInventoryBackup(datastore);
2074 }); 2078 });
2075 2079