diff options
Diffstat (limited to 'OpenSim')
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 | |||
309 | { | 309 | { |
310 | if (modified) | 310 | if (modified) |
311 | { | 311 | { |
312 | rdata.appendStatus(String.Format("<p> Modified asset {0}, UUID {1} <p>", asset.Name, asset.FullID)); | 312 | rdata.appendStatus(String.Format("<p> Modified asset {0}, UUID {1} <p>", asset.Name, asset.FullID)); |
313 | rdata.Complete(Rest.HttpStatusCodeOK); | 313 | rdata.Complete(Rest.HttpStatusCodeOK); |
314 | } | 314 | } |
315 | else | 315 | else |
@@ -376,7 +376,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory | |||
376 | { | 376 | { |
377 | if (modified) | 377 | if (modified) |
378 | { | 378 | { |
379 | rdata.appendStatus(String.Format("<p> Modified asset {0}, UUID {1} <p>", asset.Name, asset.FullID)); | 379 | rdata.appendStatus(String.Format("<p> Modified asset {0}, UUID {1} <p>", asset.Name, asset.FullID)); |
380 | rdata.Complete(Rest.HttpStatusCodeOK); | 380 | rdata.Complete(Rest.HttpStatusCodeOK); |
381 | } | 381 | } |
382 | else | 382 | 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 | |||
99 | 99 | ||
100 | enabled = true; | 100 | enabled = true; |
101 | 101 | ||
102 | if(config.Configs["RemoteAdmin"] != null) | 102 | if (config.Configs["RemoteAdmin"] != null) |
103 | { | 103 | { |
104 | password = config.Configs["RemoteAdmin"].GetString("access_password", password); | 104 | password = config.Configs["RemoteAdmin"].GetString("access_password", password); |
105 | scene.CommsManager.HttpServer.AddXmlRPCHandler("xirc_admin", XmlRpcAdminMethod, false); | 105 | scene.CommsManager.HttpServer.AddXmlRPCHandler("xirc_admin", XmlRpcAdminMethod, false); |
106 | } | 106 | } |
107 | 107 | ||
108 | } | 108 | } |
@@ -224,20 +224,20 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat | |||
224 | bool found = false; | 224 | bool found = false; |
225 | string region = String.Empty; | 225 | string region = String.Empty; |
226 | 226 | ||
227 | if(password != String.Empty) | 227 | if (password != String.Empty) |
228 | { | 228 | { |
229 | if(!requestData.ContainsKey("password")) | 229 | if (!requestData.ContainsKey("password")) |
230 | throw new Exception("Invalid request"); | 230 | throw new Exception("Invalid request"); |
231 | if(requestData["password"] != password) | 231 | if (requestData["password"] != password) |
232 | throw new Exception("Invalid request"); | 232 | throw new Exception("Invalid request"); |
233 | } | 233 | } |
234 | 234 | ||
235 | if(!requestData.ContainsKey("region")) | 235 | if (!requestData.ContainsKey("region")) |
236 | throw new Exception("No region name specified"); | 236 | throw new Exception("No region name specified"); |
237 | 237 | ||
238 | foreach(RegionState rs in m_regions) | 238 | foreach (RegionState rs in m_regions) |
239 | { | 239 | { |
240 | if(rs.Region == region) | 240 | if (rs.Region == region) |
241 | { | 241 | { |
242 | responseData["server"] = rs.cs.Server; | 242 | responseData["server"] = rs.cs.Server; |
243 | responseData["port"] = rs.cs.Port; | 243 | responseData["port"] = rs.cs.Port; |
@@ -251,7 +251,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat | |||
251 | } | 251 | } |
252 | } | 252 | } |
253 | 253 | ||
254 | if(!found) throw new Exception(String.Format("Region <{0}> not found", region)); | 254 | if (!found) throw new Exception(String.Format("Region <{0}> not found", region)); |
255 | 255 | ||
256 | responseData["success"] = true; | 256 | responseData["success"] = true; |
257 | 257 | ||
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 | |||
938 | int x = (int)(pos.X + offset.x); | 938 | int x = (int)(pos.X + offset.x); |
939 | int y = (int)(pos.Y + offset.y); | 939 | int y = (int)(pos.Y + offset.y); |
940 | 940 | ||
941 | // Clamp to valid position | 941 | // Clamp to valid position |
942 | if (x<0) | 942 | if (x<0) |
943 | x = 0; | 943 | x = 0; |
944 | else if (x>=World.Heightmap.Width) | 944 | else if (x>=World.Heightmap.Width) |
945 | x = World.Heightmap.Width-1; | 945 | x = World.Heightmap.Width-1; |
946 | if (y<0) | 946 | if (y<0) |
947 | y = 0; | 947 | y = 0; |
948 | else if (y>=World.Heightmap.Height) | 948 | else if (y>=World.Heightmap.Height) |
949 | y = World.Heightmap.Height-1; | 949 | y = World.Heightmap.Height-1; |
950 | 950 | ||
951 | 951 | ||
952 | return World.GetLandHeight(x, y); | 952 | return World.GetLandHeight(x, y); |
953 | } | 953 | } |