diff options
| author | Melanie | 2012-06-28 22:06:02 +0200 |
|---|---|---|
| committer | Melanie | 2012-06-28 22:06:02 +0200 |
| commit | 498820a74f6b288c26e2c33981297568c0c12d08 (patch) | |
| tree | c87b1c20a3e3deeee56c33719ca8abed96499bdf /OpenSim/Region/Framework/Scenes/SceneGraph.cs | |
| parent | Fix llRegionSayTo the right way (diff) | |
| parent | reactivate physics raycasts on llCastRay() until it's clear what is its prob... (diff) | |
| download | opensim-SC-498820a74f6b288c26e2c33981297568c0c12d08.zip opensim-SC-498820a74f6b288c26e2c33981297568c0c12d08.tar.gz opensim-SC-498820a74f6b288c26e2c33981297568c0c12d08.tar.bz2 opensim-SC-498820a74f6b288c26e2c33981297568c0c12d08.tar.xz | |
Merge branch 'ubitwork' into avination
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 b7466be..a600b86 100644 --- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs +++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs | |||
| @@ -585,12 +585,12 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 585 | 585 | ||
| 586 | protected internal void AddPhysicalPrim(int number) | 586 | protected internal void AddPhysicalPrim(int number) |
| 587 | { | 587 | { |
| 588 | m_physicalPrim++; | 588 | m_physicalPrim += number; |
| 589 | } | 589 | } |
| 590 | 590 | ||
| 591 | protected internal void RemovePhysicalPrim(int number) | 591 | protected internal void RemovePhysicalPrim(int number) |
| 592 | { | 592 | { |
| 593 | m_physicalPrim--; | 593 | m_physicalPrim -= number; |
| 594 | } | 594 | } |
| 595 | 595 | ||
| 596 | protected internal void AddToScriptLPS(int number) | 596 | protected internal void AddToScriptLPS(int number) |