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

Update svn properties, formatting cleanup, fix a couple compiler warnings.

0.6.0-stable
Jeff Ames 2008-08-15 10:24:04 +00:00
parent e1620c5cc3
commit dde21314e7
13 changed files with 80 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
OpenSim/ApplicationPlugins/Rest/Regions/GETHandler.cs
View File

@ -133,7 +133,8 @@ namespace OpenSim.ApplicationPlugins.Rest.Regions
return XmlWriterResult;
}
if (2 == comps.Length) {
if (2 == comps.Length)
{
string resp = ShortRegionInfo(comps[1], details[comps[1]]);
if (null != resp) return resp;
@ -153,7 +154,8 @@ namespace OpenSim.ApplicationPlugins.Rest.Regions
}
}
if (3 == comps.Length) {
if (3 == comps.Length)
{
switch (comps[1].ToLower())
{
case "prims":
@ -166,7 +168,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Regions
min = new LLVector3((float)Double.Parse(subregion[0]), (float)Double.Parse(subregion[1]), (float)Double.Parse(subregion[2]));
max = new LLVector3((float)Double.Parse(subregion[3]), (float)Double.Parse(subregion[4]), (float)Double.Parse(subregion[5]));
}
catch (Exception e)
catch (Exception)
{
return Failure(httpResponse, OSHttpStatusCode.ClientErrorBadRequest,
"GET", "invalid subregion parameter");

6
OpenSim/Region/Communications/Local/LocalBackEndServices.cs
View File

@ -177,7 +177,8 @@ namespace OpenSim.Region.Communications.Local
// TODO add a dictionary for faster lookup
foreach (RegionInfo info in m_regions.Values)
{
if(info.RegionID == regionID) return info;
if (info.RegionID == regionID)
return info;
}
return null;
}
@ -186,7 +187,8 @@ namespace OpenSim.Region.Communications.Local
{
foreach (RegionInfo regInfo in m_regions.Values)
{
if (regInfo.RegionName == regionName) return regInfo;
if (regInfo.RegionName == regionName)
return regInfo;
}
return null;
}

6
OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
View File

@ -75,8 +75,10 @@ namespace OpenSim.Region.Communications.OGS1
userData.Image = new LLUUID((string) data["profile_image"]);
userData.LastLogin = Convert.ToInt32((string) data["profile_lastlogin"]);
userData.HomeRegion = Convert.ToUInt64((string) data["home_region"]);
if(data.Contains("home_region_id")) userData.HomeRegionID = new LLUUID((string)data["home_region_id"]);
else userData.HomeRegionID = LLUUID.Zero;
if (data.Contains("home_region_id"))
userData.HomeRegionID = new LLUUID((string)data["home_region_id"]);
else
userData.HomeRegionID = LLUUID.Zero;
userData.HomeLocation =
new LLVector3((float) Convert.ToDecimal((string) data["home_coordinates_x"]),
(float) Convert.ToDecimal((string) data["home_coordinates_y"]),

12
OpenSim/Region/Environment/Scenes/ScenePresence.cs
View File

@ -1102,7 +1102,8 @@ namespace OpenSim.Region.Environment.Scenes
// Get our own copy of the part array, and sort into the order we want to test
SceneObjectPart[] partArray = targetPart.ParentGroup.GetParts();
Array.Sort(partArray, delegate(SceneObjectPart p1, SceneObjectPart p2) {
Array.Sort(partArray, delegate(SceneObjectPart p1, SceneObjectPart p2)
{
// we want the originally selected part first, then the rest in link order -- so make the selected part link num (-1)
int linkNum1 = p1==targetPart ? -1 : p1.LinkNum;
int linkNum2 = p2==targetPart ? -1 : p2.LinkNum;
@ -1772,7 +1773,8 @@ namespace OpenSim.Region.Environment.Scenes
// Because appearance setting is in a module, we actually need
// to give it access to our appearance directly, otherwise we
// get a synchronization issue.
public AvatarAppearance Appearance {
public AvatarAppearance Appearance
{
get { return m_appearance; }
set { m_appearance = value; }
}
@ -2789,7 +2791,8 @@ namespace OpenSim.Region.Environment.Scenes
}
// optimization; we have to check per script, but if nothing is pressed and nothing changed, we can skip that
if(allflags != ScriptControlled.CONTROL_ZERO || allflags != LastCommands) {
if (allflags != ScriptControlled.CONTROL_ZERO || allflags != LastCommands)
{
lock (scriptedcontrols)
{
foreach (LLUUID scriptUUID in scriptedcontrols.Keys)
@ -2798,7 +2801,8 @@ namespace OpenSim.Region.Environment.Scenes
ScriptControlled localHeld = allflags & scriptControlData.eventControls; // the flags interesting for us
ScriptControlled localLast = LastCommands & scriptControlData.eventControls; // the activated controls in the last cycle
ScriptControlled localChange = localHeld ^ localLast; // the changed bits
if(localHeld != ScriptControlled.CONTROL_ZERO || localChange != ScriptControlled.CONTROL_ZERO) {
if (localHeld != ScriptControlled.CONTROL_ZERO || localChange != ScriptControlled.CONTROL_ZERO)
{
// only send if still pressed or just changed
m_scene.EventManager.TriggerControlEvent(scriptControlData.objID, scriptUUID, UUID, (uint)localHeld, (uint)localChange);
}

2
OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueThreadClass.cs
View File

@ -43,7 +43,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase
/// </summary>
public class EventQueueThreadClass : iScriptEngineFunctionModule
{
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
// private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
/// <summary>
/// How many ms to sleep if queue is empty