From 5d77625e9ac4ce1fc7b8fd67aabf563678ef0d5d Mon Sep 17 00:00:00 2001
From: Jeff Ames
Date: Sun, 25 May 2008 23:27:38 +0000
Subject: Update svn properties.  Formatting cleanup.

---
 OpenSim/Region/Environment/Scenes/Scene.cs | 34 +++++++++++++++---------------
 1 file changed, 17 insertions(+), 17 deletions(-)

(limited to 'OpenSim/Region/Environment/Scenes/Scene.cs')

diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 1e88018..27431ed 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -86,7 +86,7 @@ namespace OpenSim.Region.Environment.Scenes
         private int m_incrementsof15seconds = 0;
         private volatile bool m_backingup = false;
 
-        protected string m_simulatorVersion = "unknown"; 
+        protected string m_simulatorVersion = "unknown";
 
         protected ModuleLoader m_moduleLoader;
         protected StorageManager m_storageManager;
@@ -218,7 +218,7 @@ namespace OpenSim.Region.Environment.Scenes
         public Scene(RegionInfo regInfo, AgentCircuitManager authen,
                      CommunicationsManager commsMan, SceneCommunicationService sceneGridService,
                      AssetCache assetCach, StorageManager storeManager, BaseHttpServer httpServer,
-                     ModuleLoader moduleLoader, bool dumpAssetsToFile, bool physicalPrim, 
+                     ModuleLoader moduleLoader, bool dumpAssetsToFile, bool physicalPrim,
                      bool SeeIntoRegionFromNeighbor, IConfigSource config, string simulatorVersion)
         {
             m_config = config;
@@ -287,7 +287,7 @@ namespace OpenSim.Region.Environment.Scenes
             m_statsReporter.SetObjectCapacity(objectCapacity);
 
             m_simulatorVersion = simulatorVersion
-                + " ChilTasks:" + m_seeIntoRegionFromNeighbor.ToString() 
+                + " ChilTasks:" + m_seeIntoRegionFromNeighbor.ToString()
                 + " PhysPrim:" + m_physicalPrim.ToString();
         }
 
@@ -1322,7 +1322,7 @@ namespace OpenSim.Region.Environment.Scenes
         /// <summary>
         /// Add an object into the scene that has come from storage
         /// </summary>
-        /// <param name="sceneObject"></param>        
+        /// <param name="sceneObject"></param>
         public void AddSceneObjectFromStorage(SceneObjectGroup sceneObject)
         {
             m_innerScene.AddSceneObjectFromStorage(sceneObject);
@@ -1335,7 +1335,7 @@ namespace OpenSim.Region.Environment.Scenes
         public void AddSceneObject(SceneObjectGroup sceneObject)
         {
             m_innerScene.AddSceneObject(sceneObject);
-        }   
+        }
 
         /// <summary>
         /// Delete this object from the scene.
@@ -1344,20 +1344,20 @@ namespace OpenSim.Region.Environment.Scenes
         public void DeleteSceneObject(SceneObjectGroup group)
         {
             SceneObjectPart rootPart = (group).GetChildPart(group.UUID);
-            
+
             if (rootPart.PhysActor != null)
             {
                 PhysicsScene.RemovePrim(rootPart.PhysActor);
                 rootPart.PhysActor = null;
-            }           
+            }
 
             if (UnlinkSceneObject(group.UUID))
             {
                 EventManager.TriggerObjectBeingRemovedFromScene(group);
                 EventManager.TriggerParcelPrimCountTainted();
-            }        
+            }
 
-            group.DeleteGroup();            
+            group.DeleteGroup();
             group.DeleteParts();
 
             // In case anybody else retains a reference to this group, signal deletion by changing the name
@@ -1367,8 +1367,8 @@ namespace OpenSim.Region.Environment.Scenes
             // conditions where a user deletes an entity while it is being stored.  Really, the update
             // code needs a redesign.
             group.Name = null;
-        }   
-        
+        }
+
         /// <summary>
         /// Unlink the given object from the scene.  Unlike delete, this just removes the record of the object - the
         /// object itself is not destroyed.
@@ -1376,14 +1376,14 @@ namespace OpenSim.Region.Environment.Scenes
         /// <param name="uuid"></param>
         /// <returns>true if the object was in the scene, false if it was not</returns>
         public bool UnlinkSceneObject(LLUUID uuid)
-        {                        
+        {
             if (m_innerScene.DeleteSceneObject(uuid))
             {
                 m_storageManager.DataStore.RemoveObject(uuid, m_regInfo.RegionID);
-                
+
                 return true;
             }
-            
+
             return false;
         }
 
@@ -1406,7 +1406,7 @@ namespace OpenSim.Region.Environment.Scenes
         {
             m_sceneXmlLoader.SavePrimsToXml2(fileName);
         }
-        
+
         /// <summary>
         /// Load a prim archive into the scene.  This loads both prims and their assets.
         /// </summary>
@@ -1416,7 +1416,7 @@ namespace OpenSim.Region.Environment.Scenes
             IRegionArchiver archiver = RequestModuleInterface<IRegionArchiver>();
             archiver.DearchiveRegion(filePath);
         }
-        
+
         /// <summary>
         /// Save the prims in the scene to an archive.  This saves both prims and their assets.
         /// </summary>
@@ -1825,7 +1825,7 @@ namespace OpenSim.Region.Environment.Scenes
 
         protected virtual ScenePresence CreateAndAddScenePresence(IClientAPI client, bool child)
         {
-            
+
             AvatarAppearance appearance = null;
             GetAvatarAppearance(client, out appearance);
 
-- 
cgit v1.1