diff options
author | Robert Adams | 2013-11-13 16:10:25 -0800 |
---|---|---|
committer | Robert Adams | 2013-11-13 16:10:25 -0800 |
commit | d67236c09defcde8e625ddc5e31f077c09ca604d (patch) | |
tree | 1946e4ffff2a8f64cbc69d0402449fc48c578292 /OpenSim/Region/Framework/Scenes/SceneGraph.cs | |
parent | varregion: extend TerrainModule to use the region size from RegionInfo (diff) | |
parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC-d67236c09defcde8e625ddc5e31f077c09ca604d.zip opensim-SC-d67236c09defcde8e625ddc5e31f077c09ca604d.tar.gz opensim-SC-d67236c09defcde8e625ddc5e31f077c09ca604d.tar.bz2 opensim-SC-d67236c09defcde8e625ddc5e31f077c09ca604d.tar.xz |
Merge branch 'master' into varregion
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneGraph.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneGraph.cs | 4 |
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) |