aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/Scene.cs
diff options
context:
space:
mode:
authormingchen2008-06-06 23:20:02 +0000
committermingchen2008-06-06 23:20:02 +0000
commit0fe363ba65d18bd324396fa1482567bc2db65d1e (patch)
tree983da1fbe2de5a4dfb2157d851561c2e55ae7f31 /OpenSim/Region/Environment/Scenes/Scene.cs
parent* llSetPrimitiveParams PRIM_FLEXIBLE is now supported. (diff)
downloadopensim-SC_OLD-0fe363ba65d18bd324396fa1482567bc2db65d1e.zip
opensim-SC_OLD-0fe363ba65d18bd324396fa1482567bc2db65d1e.tar.gz
opensim-SC_OLD-0fe363ba65d18bd324396fa1482567bc2db65d1e.tar.bz2
opensim-SC_OLD-0fe363ba65d18bd324396fa1482567bc2db65d1e.tar.xz
*Made Object Counting correct with linked objects and turned the previously protected functions that only return object counts to public so it can be easily used by outside classes.
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/Scene.cs')
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs8
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 211f320..7d076ef 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -757,13 +757,13 @@ namespace OpenSim.Region.Environment.Scenes
757 m_statsReporter.AddInPackets(0); 757 m_statsReporter.AddInPackets(0);
758 m_statsReporter.SetRootAgents(m_innerScene.GetRootAgentCount()); 758 m_statsReporter.SetRootAgents(m_innerScene.GetRootAgentCount());
759 m_statsReporter.SetChildAgents(m_innerScene.GetChildAgentCount()); 759 m_statsReporter.SetChildAgents(m_innerScene.GetChildAgentCount());
760 m_statsReporter.SetObjects(m_innerScene.GetTotalObjects()); 760 m_statsReporter.SetObjects(m_innerScene.GetTotalObjectsCount());
761 m_statsReporter.SetActiveObjects(m_innerScene.GetActiveObjects()); 761 m_statsReporter.SetActiveObjects(m_innerScene.GetActiveObjectsCount());
762 frameMS = System.Environment.TickCount - frameMS; 762 frameMS = System.Environment.TickCount - frameMS;
763 m_statsReporter.addFrameMS(frameMS); 763 m_statsReporter.addFrameMS(frameMS);
764 m_statsReporter.addPhysicsMS(physicsMS); 764 m_statsReporter.addPhysicsMS(physicsMS);
765 m_statsReporter.addOtherMS(otherMS); 765 m_statsReporter.addOtherMS(otherMS);
766 m_statsReporter.SetActiveScripts(m_innerScene.GetActiveScripts()); 766 m_statsReporter.SetActiveScripts(m_innerScene.GetActiveScriptsCount());
767 m_statsReporter.addScriptLines(m_innerScene.GetScriptLPS()); 767 m_statsReporter.addScriptLines(m_innerScene.GetScriptLPS());
768 } 768 }
769 } 769 }
@@ -1412,7 +1412,7 @@ namespace OpenSim.Region.Environment.Scenes
1412 /// <returns>true if the object was in the scene, false if it was not</returns> 1412 /// <returns>true if the object was in the scene, false if it was not</returns>
1413 public bool UnlinkSceneObject(LLUUID uuid) 1413 public bool UnlinkSceneObject(LLUUID uuid)
1414 { 1414 {
1415 if (m_innerScene.DeleteSceneObject(uuid)) 1415 if (m_innerScene.DeleteSceneObject(uuid,true))
1416 { 1416 {
1417 m_storageManager.DataStore.RemoveObject(uuid, m_regInfo.RegionID); 1417 m_storageManager.DataStore.RemoveObject(uuid, m_regInfo.RegionID);
1418 1418