aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/SceneGraph.cs
diff options
context:
space:
mode:
authorMelanie2012-07-06 20:51:18 +0100
committerMelanie2012-07-06 20:51:18 +0100
commit26d89777d88c9abfa35fed0b78bcd8f93c3d0bf2 (patch)
treebf9802d765a4965dd1b42c4b2d3145b5813c0c1f /OpenSim/Region/Framework/Scenes/SceneGraph.cs
parentMerge branch 'master' into careminster (diff)
parent added llSetVelocity. will refuse to work on vehicles and on attachments ( th... (diff)
downloadopensim-SC-26d89777d88c9abfa35fed0b78bcd8f93c3d0bf2.zip
opensim-SC-26d89777d88c9abfa35fed0b78bcd8f93c3d0bf2.tar.gz
opensim-SC-26d89777d88c9abfa35fed0b78bcd8f93c3d0bf2.tar.bz2
opensim-SC-26d89777d88c9abfa35fed0b78bcd8f93c3d0bf2.tar.xz
Merge branch 'avination' into careminster
Conflicts: OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
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 4c12496..3390aba 100644
--- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
@@ -592,12 +592,12 @@ namespace OpenSim.Region.Framework.Scenes
592 592
593 protected internal void AddPhysicalPrim(int number) 593 protected internal void AddPhysicalPrim(int number)
594 { 594 {
595 m_physicalPrim++; 595 m_physicalPrim += number;
596 } 596 }
597 597
598 protected internal void RemovePhysicalPrim(int number) 598 protected internal void RemovePhysicalPrim(int number)
599 { 599 {
600 m_physicalPrim--; 600 m_physicalPrim -= number;
601 } 601 }
602 602
603 protected internal void AddToScriptLPS(int number) 603 protected internal void AddToScriptLPS(int number)