From 64f01ade04863dbe7b392ea8f0fc4dcc8e32bd94 Mon Sep 17 00:00:00 2001
From: Jeff Ames
Date: Fri, 13 Jun 2008 00:21:53 +0000
Subject: Update svn properties, clean up formatting, refactor out duplicate
 hard-coded port numbers.

---
 .../Region/Environment/Modules/World/Serialiser/SceneXmlLoader.cs   | 4 ++--
 OpenSim/Region/Environment/Modules/World/WorldMap/WorldMapModule.cs | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'OpenSim/Region/Environment/Modules/World')

diff --git a/OpenSim/Region/Environment/Modules/World/Serialiser/SceneXmlLoader.cs b/OpenSim/Region/Environment/Modules/World/Serialiser/SceneXmlLoader.cs
index 54538d8..69f1902 100644
--- a/OpenSim/Region/Environment/Modules/World/Serialiser/SceneXmlLoader.cs
+++ b/OpenSim/Region/Environment/Modules/World/Serialiser/SceneXmlLoader.cs
@@ -193,8 +193,8 @@ namespace OpenSim.Region.Environment.Scenes
         /// <param name="xmlData"></param>
         protected static void CreatePrimFromXml2(Scene scene, string xmlData)
         {
-            SceneObjectGroup obj = new SceneObjectGroup(xmlData);            
-            
+            SceneObjectGroup obj = new SceneObjectGroup(xmlData);
+
             LLVector3 receivedVelocity = obj.RootPart.Velocity;
             //System.Console.WriteLine(obj.RootPart.Velocity.ToString());
             scene.AddSceneObjectFromStorage(obj);
diff --git a/OpenSim/Region/Environment/Modules/World/WorldMap/WorldMapModule.cs b/OpenSim/Region/Environment/Modules/World/WorldMap/WorldMapModule.cs
index 041af2b..ebcb440 100644
--- a/OpenSim/Region/Environment/Modules/World/WorldMap/WorldMapModule.cs
+++ b/OpenSim/Region/Environment/Modules/World/WorldMap/WorldMapModule.cs
@@ -136,7 +136,7 @@ namespace OpenSim.Region.Environment.Modules.World.WorldMap
             {
                 bool lookup = false;
 
-                lock(cachedMapBlocks)
+                lock (cachedMapBlocks)
                 {
                     if (cachedMapBlocks.Count > 0 && ((cachedTime + 1800) > Util.UnixTimeSinceEpoch()))
                     {
@@ -157,7 +157,7 @@ namespace OpenSim.Region.Environment.Modules.World.WorldMap
                     mapBlocks = m_scene.CommsManager.GridService.RequestNeighbourMapBlocks((int)m_scene.RegionInfo.RegionLocX - 8, (int)m_scene.RegionInfo.RegionLocY - 8, (int)m_scene.RegionInfo.RegionLocX + 8, (int)m_scene.RegionInfo.RegionLocY + 8);
                     avatarPresence.ControllingClient.SendMapBlock(mapBlocks);
                     
-                    lock(cachedMapBlocks)
+                    lock (cachedMapBlocks)
                         cachedMapBlocks = mapBlocks;
 
                     cachedTime = Util.UnixTimeSinceEpoch();
@@ -236,4 +236,4 @@ namespace OpenSim.Region.Environment.Modules.World.WorldMap
             remoteClient.SendMapBlock(mapBlocks);
         }
     }
-}
\ No newline at end of file
+}
-- 
cgit v1.1