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

Minor formatting cleanup.

0.6.0-stable
Jeff Ames 2008-06-18 03:50:39 +00:00
parent 7a11f6f1e2
commit a728417eda
5 changed files with 55 additions and 72 deletions
OpenSim
Framework/Servers
Region

2
OpenSim/Framework/Servers/BaseOpenSimServer.cs
View File

@ -183,7 +183,7 @@ namespace OpenSim.Framework.Servers
switch (ShowWhat) switch (ShowWhat)
{ {
case "info": case "info":
Notice("Version: " + m_version ); Notice("Version: " + m_version);
Notice("Startup directory: " + m_startupDirectory); Notice("Startup directory: " + m_startupDirectory);
break; break;

2
OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequestExecution.cs
View File

@ -1,4 +1,4 @@
/* /*
* Copyright (c) Contributors, http://opensimulator.org/ * Copyright (c) Contributors, http://opensimulator.org/
* See CONTRIBUTORS.TXT for a full list of copyright holders. * See CONTRIBUTORS.TXT for a full list of copyright holders.
* *

2
OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequestPreparation.cs
View File

@ -1,4 +1,4 @@
/* /*
* Copyright (c) Contributors, http://opensimulator.org/ * Copyright (c) Contributors, http://opensimulator.org/
* See CONTRIBUTORS.TXT for a full list of copyright holders. * See CONTRIBUTORS.TXT for a full list of copyright holders.
* *

50
OpenSim/Region/Environment/Scenes/Scene.cs
View File

@ -410,7 +410,6 @@ namespace OpenSim.Region.Environment.Scenes
if (!CheckNeighborRegion(region)) if (!CheckNeighborRegion(region))
{ {
m_neighbours.Add(region); m_neighbours.Add(region);
} }
} }
} }
@ -430,9 +429,8 @@ namespace OpenSim.Region.Environment.Scenes
} }
} }
return found; return found;
} }
public virtual void Restart(float seconds) public virtual void Restart(float seconds)
{ {
// notifications are done in 15 second increments // notifications are done in 15 second increments
@ -779,17 +777,14 @@ namespace OpenSim.Region.Environment.Scenes
catch (AccessViolationException e) catch (AccessViolationException e)
{ {
m_log.Error("[Scene]: Failed with exception " + e.ToString() + " On Region: " + RegionInfo.RegionName); m_log.Error("[Scene]: Failed with exception " + e.ToString() + " On Region: " + RegionInfo.RegionName);
} }
catch (NullReferenceException e) catch (NullReferenceException e)
{ {
m_log.Error("[Scene]: Failed with exception " + e.ToString() + " On Region: " + RegionInfo.RegionName); m_log.Error("[Scene]: Failed with exception " + e.ToString() + " On Region: " + RegionInfo.RegionName);
} }
catch (InvalidOperationException e) catch (InvalidOperationException e)
{ {
m_log.Error("[Scene]: Failed with exception " + e.ToString() + " On Region: " + RegionInfo.RegionName); m_log.Error("[Scene]: Failed with exception " + e.ToString() + " On Region: " + RegionInfo.RegionName);
} }
catch (Exception e) catch (Exception e)
{ {
@ -1191,10 +1186,6 @@ namespace OpenSim.Region.Environment.Scenes
// Not sure why some of these are null, oh well. // Not sure why some of these are null, oh well.
int colorr = 255 - (int)(texcolor.R * 255f); int colorr = 255 - (int)(texcolor.R * 255f);
int colorg = 255 - (int)(texcolor.G * 255f); int colorg = 255 - (int)(texcolor.G * 255f);
int colorb = 255 - (int)(texcolor.B * 255f); int colorb = 255 - (int)(texcolor.B * 255f);
@ -1314,8 +1305,6 @@ namespace OpenSim.Region.Environment.Scenes
return; return;
} }
LLUUID lastMapRegionUUID = m_regInfo.lastMapUUID; LLUUID lastMapRegionUUID = m_regInfo.lastMapUUID;
int lastMapRefresh = 0; int lastMapRefresh = 0;
@ -1325,23 +1314,25 @@ namespace OpenSim.Region.Environment.Scenes
try try
{ {
lastMapRefresh = Convert.ToInt32(m_regInfo.lastMapRefresh); lastMapRefresh = Convert.ToInt32(m_regInfo.lastMapRefresh);
} catch (ArgumentException) }
{} catch (ArgumentException)
{
}
catch (FormatException) catch (FormatException)
{} {
}
catch (OverflowException) catch (OverflowException)
{} {
}
LLUUID TerrainImageLLUUID = LLUUID.Random(); LLUUID TerrainImageLLUUID = LLUUID.Random();
if (lastMapRegionUUID == LLUUID.Zero || (lastMapRefresh + RefreshSeconds) < Util.UnixTimeSinceEpoch()) if (lastMapRegionUUID == LLUUID.Zero || (lastMapRefresh + RefreshSeconds) < Util.UnixTimeSinceEpoch())
{ {
m_regInfo.SaveLastMapUUID(TerrainImageLLUUID); m_regInfo.SaveLastMapUUID(TerrainImageLLUUID);
m_log.Warn("[MAPTILE]: STORING MAPTILE IMAGE"); m_log.Warn("[MAPTILE]: STORING MAPTILE IMAGE");
//Extra protection.. probably not needed. //Extra protection.. probably not needed.
} }
else else
{ {
@ -1349,8 +1340,6 @@ namespace OpenSim.Region.Environment.Scenes
m_log.Warn("[MAPTILE]: REUSING OLD MAPTILE IMAGE ID"); m_log.Warn("[MAPTILE]: REUSING OLD MAPTILE IMAGE ID");
} }
m_regInfo.EstateSettings.terrainImageID = TerrainImageLLUUID; m_regInfo.EstateSettings.terrainImageID = TerrainImageLLUUID;
AssetBase asset = new AssetBase(); AssetBase asset = new AssetBase();
@ -1379,22 +1368,23 @@ namespace OpenSim.Region.Environment.Scenes
lastMapRefresh = Convert.ToInt32(m_regInfo.lastMapRefresh); lastMapRefresh = Convert.ToInt32(m_regInfo.lastMapRefresh);
} }
catch (ArgumentException) catch (ArgumentException)
{ } {
}
catch (FormatException) catch (FormatException)
{ } {
}
catch (OverflowException) catch (OverflowException)
{ } {
}
LLUUID TerrainImageLLUUID = LLUUID.Random(); LLUUID TerrainImageLLUUID = LLUUID.Random();
if (lastMapRegionUUID == LLUUID.Zero || (lastMapRefresh + RefreshSeconds) < Util.UnixTimeSinceEpoch()) if (lastMapRegionUUID == LLUUID.Zero || (lastMapRefresh + RefreshSeconds) < Util.UnixTimeSinceEpoch())
{ {
m_regInfo.SaveLastMapUUID(TerrainImageLLUUID); m_regInfo.SaveLastMapUUID(TerrainImageLLUUID);
//m_log.Warn(terrainImageID); //m_log.Warn(terrainImageID);
//Extra protection.. probably not needed. //Extra protection.. probably not needed.
} }
else else
{ {
@ -2980,9 +2970,6 @@ namespace OpenSim.Region.Environment.Scenes
{ {
if (controller.AgentId != godID) if (controller.AgentId != godID)
controller.Kick(Helpers.FieldToUTF8String(reason)); controller.Kick(Helpers.FieldToUTF8String(reason));
} }
); );
@ -3261,13 +3248,11 @@ namespace OpenSim.Region.Environment.Scenes
public void TriggerObjectChanged(uint localID, uint change) public void TriggerObjectChanged(uint localID, uint change)
{ {
m_eventManager.TriggerOnScriptChangedEvent(localID, change); m_eventManager.TriggerOnScriptChangedEvent(localID, change);
} }
public void TriggerAtTargetEvent(uint localID, uint handle, LLVector3 targetpos, LLVector3 currentpos) public void TriggerAtTargetEvent(uint localID, uint handle, LLVector3 targetpos, LLVector3 currentpos)
{ {
m_eventManager.TriggerAtTargetEvent(localID, handle, targetpos, currentpos); m_eventManager.TriggerAtTargetEvent(localID, handle, targetpos, currentpos);
} }
@ -3331,6 +3316,7 @@ namespace OpenSim.Region.Environment.Scenes
return false; return false;
} }
} }
public bool scriptDanger(uint localID, LLVector3 pos) public bool scriptDanger(uint localID, LLVector3 pos)
{ {
SceneObjectPart part = GetSceneObjectPart(localID); SceneObjectPart part = GetSceneObjectPart(localID);
@ -3351,7 +3337,6 @@ namespace OpenSim.Region.Environment.Scenes
{ {
LLVector3 pos = part.GetWorldPosition(); LLVector3 pos = part.GetWorldPosition();
return scriptDanger(part, pos); return scriptDanger(part, pos);
} }
else else
{ {
@ -3589,8 +3574,7 @@ namespace OpenSim.Region.Environment.Scenes
} }
return visualParams; return visualParams;
} }
#endregion #endregion
} }
} }

3
OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
View File

@ -765,8 +765,7 @@ namespace OpenSim.Region.ScriptEngine.Common
return new LSL_Types.Vector3( return new LSL_Types.Vector3(
SensedObject.AbsolutePosition.X, SensedObject.AbsolutePosition.X,
SensedObject.AbsolutePosition.Y, SensedObject.AbsolutePosition.Y,
SensedObject.AbsolutePosition.Y ); SensedObject.AbsolutePosition.Y);
} }
public LSL_Types.Quaternion llDetectedRot(int number) public LSL_Types.Quaternion llDetectedRot(int number)