Update svn properties, minor formatting cleanup.

2 files changed, 23 insertions, 23 deletions

diff --git a/OpenSim/Region/Environment/Modules/Avatar/Chat/XIRCBridgeModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Chat/XIRCBridgeModule.cs
index d7abc19..4594e6c 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/Chat/XIRCBridgeModule.cs
+++ b/OpenSim/Region/Environment/Modules/Avatar/Chat/XIRCBridgeModule.cs
@@ -99,10 +99,10 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat
 
                 enabled = true;
 
-                if(config.Configs["RemoteAdmin"] != null)
+                if (config.Configs["RemoteAdmin"] != null)
                 {
-                                        password = config.Configs["RemoteAdmin"].GetString("access_password", password);
-                                        scene.CommsManager.HttpServer.AddXmlRPCHandler("xirc_admin", XmlRpcAdminMethod, false);
+                    password = config.Configs["RemoteAdmin"].GetString("access_password", password);
+                    scene.CommsManager.HttpServer.AddXmlRPCHandler("xirc_admin", XmlRpcAdminMethod, false);
                 }
 
             }
@@ -224,20 +224,20 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat
                 bool    found = false;
                 string region = String.Empty;
 
-                if(password != String.Empty)
+                if (password != String.Empty)
                 {
-                                        if(!requestData.ContainsKey("password"))
-                                                throw new Exception("Invalid request");
-                                        if(requestData["password"] != password)
-                                                throw new Exception("Invalid request");
+                    if (!requestData.ContainsKey("password"))
+                        throw new Exception("Invalid request");
+                    if (requestData["password"] != password)
+                        throw new Exception("Invalid request");
                 }
 
-                if(!requestData.ContainsKey("region"))
-                                        throw new Exception("No region name specified");
+                if (!requestData.ContainsKey("region"))
+                    throw new Exception("No region name specified");
                 
-                foreach(RegionState rs in m_regions)
+                foreach (RegionState rs in m_regions)
                 {
-                                        if(rs.Region == region)
+                    if (rs.Region == region)
                     {
                         responseData["server"]    = rs.cs.Server;
                         responseData["port"]      = rs.cs.Port;
@@ -251,7 +251,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat
                     }
                 }
 
-                if(!found) throw new Exception(String.Format("Region <{0}> not found", region));
+                if (!found) throw new Exception(String.Format("Region <{0}> not found", region));
 
                 responseData["success"] = true;
 
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 499273c..a92500c 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -938,16 +938,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             int x = (int)(pos.X + offset.x);
             int y = (int)(pos.Y + offset.y);
 
-            // Clamp to valid position
-            if (x<0) 
-                x = 0;
-            else if (x>=World.Heightmap.Width)
-                x = World.Heightmap.Width-1;
-            if (y<0) 
-                y = 0;
-            else if (y>=World.Heightmap.Height)
-                y = World.Heightmap.Height-1;
-            
+            // Clamp to valid position
+            if (x<0) 
+                x = 0;
+            else if (x>=World.Heightmap.Width)
+                x = World.Heightmap.Width-1;
+            if (y<0) 
+                y = 0;
+            else if (y>=World.Heightmap.Height)
+                y = World.Heightmap.Height-1;
+        
 
             return World.GetLandHeight(x, y);
         }