aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/SceneGraph.cs
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2013-11-13 23:25:54 +0000
committerJustin Clark-Casey (justincc)2013-11-13 23:25:54 +0000
commit7da10850b063d4b31ad48cf3448b9a76bc5bd835 (patch)
treebeb0e99738ef84ee2b8f9e9aa347f70c63af6746 /OpenSim/Region/Framework/Scenes/SceneGraph.cs
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
downloadopensim-SC_OLD-7da10850b063d4b31ad48cf3448b9a76bc5bd835.zip
opensim-SC_OLD-7da10850b063d4b31ad48cf3448b9a76bc5bd835.tar.gz
opensim-SC_OLD-7da10850b063d4b31ad48cf3448b9a76bc5bd835.tar.bz2
opensim-SC_OLD-7da10850b063d4b31ad48cf3448b9a76bc5bd835.tar.xz
Fix bug where removing a physical linkset would only decrement the Active Objects statistic by 1 instead of by the number of prims removed.
Unlike LL, OpenSimulator currently uses this stat to record the number of prims in the physics simulation, even when they are at rest. Added regression test for this case.
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneGraph.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneGraph.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
index 0a5bfd2..1aecce5 100644
--- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
@@ -519,12 +519,12 @@ namespace OpenSim.Region.Framework.Scenes
519 519
520 protected internal void AddPhysicalPrim(int number) 520 protected internal void AddPhysicalPrim(int number)
521 { 521 {
522 m_physicalPrim++; 522 m_physicalPrim += number;
523 } 523 }
524 524
525 protected internal void RemovePhysicalPrim(int number) 525 protected internal void RemovePhysicalPrim(int number)
526 { 526 {
527 m_physicalPrim--; 527 m_physicalPrim -= number;
528 } 528 }
529 529
530 protected internal void AddToScriptLPS(int number) 530 protected internal void AddToScriptLPS(int number)