OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update svn properties, minor formatting cleanup.

0.6.0-stable
Jeff Ames 2008-11-01 07:21:40 +00:00
parent 465a931c05
commit 337da2a7a3
3 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/ApplicationPlugins/Rest/Inventory/RestAssetServices.cs
View File

@ -309,7 +309,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
{
if (modified)
{
rdata.appendStatus(String.Format("<p> Modified asset {0}, UUID {1} <p>", asset.Name, asset.FullID));
rdata.appendStatus(String.Format("<p> Modified asset {0}, UUID {1} <p>", asset.Name, asset.FullID));
rdata.Complete(Rest.HttpStatusCodeOK);
}
else
@ -376,7 +376,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
{
if (modified)
{
rdata.appendStatus(String.Format("<p> Modified asset {0}, UUID {1} <p>", asset.Name, asset.FullID));
rdata.appendStatus(String.Format("<p> Modified asset {0}, UUID {1} <p>", asset.Name, asset.FullID));
rdata.Complete(Rest.HttpStatusCodeOK);
}
else

26
OpenSim/Region/Environment/Modules/Avatar/Chat/XIRCBridgeModule.cs
View File

@ -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;

20
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
View File

@ -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);
}