From 75e28b3a165574e665b364180960c037bab74529 Mon Sep 17 00:00:00 2001
From: Teravus Ovares (Dan Olivares)
Date: Tue, 1 Dec 2009 10:48:11 -0500
Subject: * Fix Inconsistent line ending style on Scene

---
 OpenSim/Region/Framework/Scenes/Scene.cs | 54 ++++++++++++++++----------------
 1 file changed, 27 insertions(+), 27 deletions(-)

diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index a3f3d8f..8788ced 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -1159,8 +1159,8 @@ namespace OpenSim.Region.Framework.Scenes
             while (!shuttingdown)
             {
                 TimeSpan SinceLastFrame = DateTime.UtcNow - m_lastupdate;
-                physicsFPS = 0f;
-
+                physicsFPS = 0f;
+
                 maintc = Util.EnvironmentTickCount();
                 int tmpFrameMS = maintc;
                 tempOnRezMS = eventMS = backupMS = terrainMS = landMS = 0;
@@ -1189,8 +1189,8 @@ namespace OpenSim.Region.Framework.Scenes
                     physicsMS2 = Util.EnvironmentTickCountSubtract(tmpPhysicsMS2);
 
                     if (m_frame % m_update_entitymovement == 0)
-                        m_sceneGraph.UpdateScenePresenceMovement();
-
+                        m_sceneGraph.UpdateScenePresenceMovement();
+
                     int tmpPhysicsMS = Util.EnvironmentTickCount();
                     if (m_frame % m_update_physics == 0)
                     {
@@ -1198,49 +1198,49 @@ namespace OpenSim.Region.Framework.Scenes
                             physicsFPS = m_sceneGraph.UpdatePhysics(Math.Max(SinceLastFrame.TotalSeconds, m_timespan));
                         if (SynchronizeScene != null)
                             SynchronizeScene(this);
-                    }
+                    }
                     physicsMS = Util.EnvironmentTickCountSubtract(tmpPhysicsMS);
 
                     // Delete temp-on-rez stuff
                     if (m_frame % m_update_backup == 0)
-                    {
+                    {
                         int tmpTempOnRezMS = Util.EnvironmentTickCount();
-                        CleanTempObjects();
+                        CleanTempObjects();
                         tempOnRezMS = Util.EnvironmentTickCountSubtract(tmpTempOnRezMS);
                     }
 
                     if (RegionStatus != RegionStatus.SlaveScene)
                     {
                         if (m_frame % m_update_events == 0)
-                        {
+                        {
                             int evMS = Util.EnvironmentTickCount();
-                            UpdateEvents();
+                            UpdateEvents();
                             eventMS = Util.EnvironmentTickCountSubtract(evMS); ;
                         }
 
                         if (m_frame % m_update_backup == 0)
-                        {
+                        {
                             int backMS = Util.EnvironmentTickCount();
-                            UpdateStorageBackup();
+                            UpdateStorageBackup();
                             backupMS = Util.EnvironmentTickCountSubtract(backMS);
                         }
 
                         if (m_frame % m_update_terrain == 0)
-                        {
+                        {
                             int terMS = Util.EnvironmentTickCount();
-                            UpdateTerrain();
+                            UpdateTerrain();
                             terrainMS = Util.EnvironmentTickCountSubtract(terMS);
                         }
 
                         if (m_frame % m_update_land == 0)
-                        {
+                        {
                             int ldMS = Util.EnvironmentTickCount();
-                            UpdateLand();
+                            UpdateLand();
                             landMS = Util.EnvironmentTickCountSubtract(ldMS);
-                        }
-
+                        }
+
                         frameMS = Util.EnvironmentTickCountSubtract(tmpFrameMS);
-                        otherMS = tempOnRezMS + eventMS + backupMS + terrainMS + landMS;
+                        otherMS = tempOnRezMS + eventMS + backupMS + terrainMS + landMS;
                         lastCompletedFrame = Util.EnvironmentTickCount();
 
                         // if (m_frame%m_update_avatars == 0)
@@ -1293,8 +1293,8 @@ namespace OpenSim.Region.Framework.Scenes
                 finally
                 {
                     m_lastupdate = DateTime.UtcNow;
-                }
-
+                }
+
                 maintc = Util.EnvironmentTickCountSubtract(maintc);
                 maintc = (int)(m_timespan * 1000) - maintc;
 
@@ -2581,8 +2581,8 @@ namespace OpenSim.Region.Framework.Scenes
                     sp.IsChildAgent = false;
                     Util.FireAndForget(delegate(object o) { sp.RezAttachments(); });
                 }
-            }
-
+            }
+
             m_LastLogin = Util.EnvironmentTickCount();
             EventManager.TriggerOnNewClient(client);
         }
@@ -4650,15 +4650,15 @@ namespace OpenSim.Region.Framework.Scenes
             // 3 = We have seen a new user enter within the past 4 minutes
             // which can be seen as positive confirmation of sim health
             //
-            int health=1; // Start at 1, means we're up
-
+            int health=1; // Start at 1, means we're up
+
             if ((Util.EnvironmentTickCountSubtract(m_lastUpdate)) < 1000)
                 health+=1;
             else
                 return health;
 
             // A login in the last 4 mins? We can't be doing too badly
-            //
+            //
             if ((Util.EnvironmentTickCountSubtract(m_LastLogin)) < 240000)
                 health++;
             else
@@ -4855,8 +4855,8 @@ namespace OpenSim.Region.Framework.Scenes
         private void CheckHeartbeat()
         {
             if (m_firstHeartbeat)
-                return;
-
+                return;
+
             if (Util.EnvironmentTickCountSubtract(m_lastUpdate) > 2000)
                 StartTimer();
         }
-- 
cgit v1.1