From 0fe363ba65d18bd324396fa1482567bc2db65d1e Mon Sep 17 00:00:00 2001 From: mingchen Date: Fri, 6 Jun 2008 23:20:02 +0000 Subject: *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. --- OpenSim/Region/Environment/Scenes/Scene.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'OpenSim/Region/Environment/Scenes/Scene.cs') 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 m_statsReporter.AddInPackets(0); m_statsReporter.SetRootAgents(m_innerScene.GetRootAgentCount()); m_statsReporter.SetChildAgents(m_innerScene.GetChildAgentCount()); - m_statsReporter.SetObjects(m_innerScene.GetTotalObjects()); - m_statsReporter.SetActiveObjects(m_innerScene.GetActiveObjects()); + m_statsReporter.SetObjects(m_innerScene.GetTotalObjectsCount()); + m_statsReporter.SetActiveObjects(m_innerScene.GetActiveObjectsCount()); frameMS = System.Environment.TickCount - frameMS; m_statsReporter.addFrameMS(frameMS); m_statsReporter.addPhysicsMS(physicsMS); m_statsReporter.addOtherMS(otherMS); - m_statsReporter.SetActiveScripts(m_innerScene.GetActiveScripts()); + m_statsReporter.SetActiveScripts(m_innerScene.GetActiveScriptsCount()); m_statsReporter.addScriptLines(m_innerScene.GetScriptLPS()); } } @@ -1412,7 +1412,7 @@ namespace OpenSim.Region.Environment.Scenes /// true if the object was in the scene, false if it was not public bool UnlinkSceneObject(LLUUID uuid) { - if (m_innerScene.DeleteSceneObject(uuid)) + if (m_innerScene.DeleteSceneObject(uuid,true)) { m_storageManager.DataStore.RemoveObject(uuid, m_regInfo.RegionID); -- cgit v1.1