aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/Scene.cs
diff options
context:
space:
mode:
authorJeff Ames2008-05-01 14:31:30 +0000
committerJeff Ames2008-05-01 14:31:30 +0000
commitd51ce47b2d7635b17f3dd429158e8f59b78b83aa (patch)
treed3595bd5194199184059aa398b91a51dc6c799cf /OpenSim/Region/Environment/Scenes/Scene.cs
parent* Looks like I had the bamboo build right in the first place - it was just th... (diff)
downloadopensim-SC_OLD-d51ce47b2d7635b17f3dd429158e8f59b78b83aa.zip
opensim-SC_OLD-d51ce47b2d7635b17f3dd429158e8f59b78b83aa.tar.gz
opensim-SC_OLD-d51ce47b2d7635b17f3dd429158e8f59b78b83aa.tar.bz2
opensim-SC_OLD-d51ce47b2d7635b17f3dd429158e8f59b78b83aa.tar.xz
Update svn properties. Minor formatting cleanup.
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/Scene.cs')
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs3
1 files changed, 0 insertions, 3 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 203f6d3..30e3815 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -658,7 +658,6 @@ namespace OpenSim.Region.Environment.Scenes
658 float physicsFPS = 0; 658 float physicsFPS = 0;
659 int agentsInScene = m_innerScene.GetRootAgentCount() + m_innerScene.GetChildAgentCount(); 659 int agentsInScene = m_innerScene.GetRootAgentCount() + m_innerScene.GetChildAgentCount();
660 660
661
662 if (agentsInScene > 21) 661 if (agentsInScene > 21)
663 { 662 {
664 if (m_update_entities == 1) 663 if (m_update_entities == 1)
@@ -676,7 +675,6 @@ namespace OpenSim.Region.Environment.Scenes
676 } 675 }
677 } 676 }
678 677
679
680 frameMS = System.Environment.TickCount; 678 frameMS = System.Environment.TickCount;
681 try 679 try
682 { 680 {
@@ -687,7 +685,6 @@ namespace OpenSim.Region.Environment.Scenes
687 if (m_frame == Int32.MaxValue) 685 if (m_frame == Int32.MaxValue)
688 m_frame = 0; 686 m_frame = 0;
689 687
690
691 physicsMS2 = System.Environment.TickCount; 688 physicsMS2 = System.Environment.TickCount;
692 if ((m_frame % m_update_physics == 0) && m_physics_enabled) 689 if ((m_frame % m_update_physics == 0) && m_physics_enabled)
693 m_innerScene.UpdatePreparePhysics(); 690 m_innerScene.UpdatePreparePhysics();