From 337da2a7a3e330d465aef421e51729bb3df03244 Mon Sep 17 00:00:00 2001 From: Jeff Ames Date: Sat, 1 Nov 2008 07:21:40 +0000 Subject: Update svn properties, minor formatting cleanup. --- .../Rest/Inventory/RestAssetServices.cs | 4 ++-- .../Modules/Avatar/Chat/XIRCBridgeModule.cs | 26 +++++++++++----------- .../Shared/Api/Implementation/LSL_Api.cs | 20 ++++++++--------- 3 files changed, 25 insertions(+), 25 deletions(-) diff --git a/OpenSim/ApplicationPlugins/Rest/Inventory/RestAssetServices.cs b/OpenSim/ApplicationPlugins/Rest/Inventory/RestAssetServices.cs index bb76c1f..35c6de9 100644 --- a/OpenSim/ApplicationPlugins/Rest/Inventory/RestAssetServices.cs +++ b/OpenSim/ApplicationPlugins/Rest/Inventory/RestAssetServices.cs @@ -309,7 +309,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory { if (modified) { - rdata.appendStatus(String.Format("
Modified asset {0}, UUID {1}
", asset.Name, asset.FullID)); + rdata.appendStatus(String.Format("
Modified asset {0}, UUID {1}
", asset.Name, asset.FullID)); rdata.Complete(Rest.HttpStatusCodeOK); } else @@ -376,7 +376,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory { if (modified) { - rdata.appendStatus(String.Format("
Modified asset {0}, UUID {1}
", asset.Name, asset.FullID)); + rdata.appendStatus(String.Format("
Modified asset {0}, UUID {1}
", asset.Name, asset.FullID)); rdata.Complete(Rest.HttpStatusCodeOK); } else 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); } -- cgit v1.1