Update svn properties, minor formatting cleanup.
parent
465a931c05
commit
337da2a7a3
|
@ -309,7 +309,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
|
||||||
{
|
{
|
||||||
if (modified)
|
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);
|
rdata.Complete(Rest.HttpStatusCodeOK);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
@ -376,7 +376,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
|
||||||
{
|
{
|
||||||
if (modified)
|
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);
|
rdata.Complete(Rest.HttpStatusCodeOK);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
|
|
@ -99,10 +99,10 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat
|
||||||
|
|
||||||
enabled = true;
|
enabled = true;
|
||||||
|
|
||||||
if(config.Configs["RemoteAdmin"] != null)
|
if (config.Configs["RemoteAdmin"] != null)
|
||||||
{
|
{
|
||||||
password = config.Configs["RemoteAdmin"].GetString("access_password", password);
|
password = config.Configs["RemoteAdmin"].GetString("access_password", password);
|
||||||
scene.CommsManager.HttpServer.AddXmlRPCHandler("xirc_admin", XmlRpcAdminMethod, false);
|
scene.CommsManager.HttpServer.AddXmlRPCHandler("xirc_admin", XmlRpcAdminMethod, false);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -224,20 +224,20 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat
|
||||||
bool found = false;
|
bool found = false;
|
||||||
string region = String.Empty;
|
string region = String.Empty;
|
||||||
|
|
||||||
if(password != String.Empty)
|
if (password != String.Empty)
|
||||||
{
|
{
|
||||||
if(!requestData.ContainsKey("password"))
|
if (!requestData.ContainsKey("password"))
|
||||||
throw new Exception("Invalid request");
|
throw new Exception("Invalid request");
|
||||||
if(requestData["password"] != password)
|
if (requestData["password"] != password)
|
||||||
throw new Exception("Invalid request");
|
throw new Exception("Invalid request");
|
||||||
}
|
}
|
||||||
|
|
||||||
if(!requestData.ContainsKey("region"))
|
if (!requestData.ContainsKey("region"))
|
||||||
throw new Exception("No region name specified");
|
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["server"] = rs.cs.Server;
|
||||||
responseData["port"] = rs.cs.Port;
|
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;
|
responseData["success"] = true;
|
||||||
|
|
||||||
|
|
|
@ -938,16 +938,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
|
||||||
int x = (int)(pos.X + offset.x);
|
int x = (int)(pos.X + offset.x);
|
||||||
int y = (int)(pos.Y + offset.y);
|
int y = (int)(pos.Y + offset.y);
|
||||||
|
|
||||||
// Clamp to valid position
|
// Clamp to valid position
|
||||||
if (x<0)
|
if (x<0)
|
||||||
x = 0;
|
x = 0;
|
||||||
else if (x>=World.Heightmap.Width)
|
else if (x>=World.Heightmap.Width)
|
||||||
x = World.Heightmap.Width-1;
|
x = World.Heightmap.Width-1;
|
||||||
if (y<0)
|
if (y<0)
|
||||||
y = 0;
|
y = 0;
|
||||||
else if (y>=World.Heightmap.Height)
|
else if (y>=World.Heightmap.Height)
|
||||||
y = World.Heightmap.Height-1;
|
y = World.Heightmap.Height-1;
|
||||||
|
|
||||||
|
|
||||||
return World.GetLandHeight(x, y);
|
return World.GetLandHeight(x, y);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue