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

Formatting cleanup.

0.6.0-stable
Jeff Ames 2008-05-14 05:11:23 +00:00
parent eff470c0de
commit c995d60d37
62 changed files with 283 additions and 291 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
OpenSim/Data/Base/BaseTableMapper.cs
View File

@ -125,7 +125,7 @@ namespace OpenSim.Data.Base
// HACK: This is a temporary function used by TryGetValue(). // HACK: This is a temporary function used by TryGetValue().
// Due to a bug in mono 1.2.6, delegate blocks cannot contain // Due to a bug in mono 1.2.6, delegate blocks cannot contain
// a using() block. This has been fixed in SVN, so the next // a using block. This has been fixed in SVN, so the next
// mono release should work. // mono release should work.
private void TryGetConnectionValue(DbConnection connection, TPrimaryKey primaryKey, ref TRowMapper result, ref bool success) private void TryGetConnectionValue(DbConnection connection, TPrimaryKey primaryKey, ref TRowMapper result, ref bool success)
{ {
@ -165,7 +165,7 @@ namespace OpenSim.Data.Base
// HACK: This is a temporary function used by Remove(). // HACK: This is a temporary function used by Remove().
// Due to a bug in mono 1.2.6, delegate blocks cannot contain // Due to a bug in mono 1.2.6, delegate blocks cannot contain
// a using() block. This has been fixed in SVN, so the next // a using block. This has been fixed in SVN, so the next
// mono release should work. // mono release should work.
protected virtual void TryDelete(DbConnection connection, TPrimaryKey id, ref int deleted) protected virtual void TryDelete(DbConnection connection, TPrimaryKey id, ref int deleted)
{ {
@ -215,7 +215,7 @@ namespace OpenSim.Data.Base
// HACK: This is a temporary function used by Update(). // HACK: This is a temporary function used by Update().
// Due to a bug in mono 1.2.6, delegate blocks cannot contain // Due to a bug in mono 1.2.6, delegate blocks cannot contain
// a using() block. This has been fixed in SVN, so the next // a using block. This has been fixed in SVN, so the next
// mono release should work. // mono release should work.
protected void TryUpdate(DbConnection connection, TPrimaryKey primaryKey, TRowMapper value, ref int updated) protected void TryUpdate(DbConnection connection, TPrimaryKey primaryKey, TRowMapper value, ref int updated)
{ {
@ -246,7 +246,7 @@ namespace OpenSim.Data.Base
// HACK: This is a temporary function used by Add(). // HACK: This is a temporary function used by Add().
// Due to a bug in mono 1.2.6, delegate blocks cannot contain // Due to a bug in mono 1.2.6, delegate blocks cannot contain
// a using() block. This has been fixed in SVN, so the next // a using block. This has been fixed in SVN, so the next
// mono release should work. // mono release should work.
protected void TryAdd(DbConnection connection, TRowMapper value, ref int added) protected void TryAdd(DbConnection connection, TRowMapper value, ref int added)
{ {

9
OpenSim/Grid/Manager/OpenGridServices.Manager/GridServerConnectionManager.cs
View File

@ -89,12 +89,13 @@ namespace OpenGridServices.Manager
for (int i = 0; i <= rootnode.ChildNodes.Count; i++) for (int i = 0; i <= rootnode.ChildNodes.Count; i++)
{ {
if(rootnode.ChildNodes.Item(i).Name != "region") { if (rootnode.ChildNodes.Item(i).Name != "region")
{
// TODO - ERROR! // TODO - ERROR!
} else { }
else
{
TempRegionData = new RegionBlock(); TempRegionData = new RegionBlock();
} }
} }
} }

3
OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
View File

@ -3094,7 +3094,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
return true; return true;
} }
public void SendScriptQuestion(LLUUID taskID, string taskName, string ownerName, LLUUID itemID, int question) public void SendScriptQuestion(LLUUID taskID, string taskName, string ownerName, LLUUID itemID, int question)
{ {
ScriptQuestionPacket scriptQuestion = (ScriptQuestionPacket)PacketPool.Instance.GetPacket(PacketType.ScriptQuestion); ScriptQuestionPacket scriptQuestion = (ScriptQuestionPacket)PacketPool.Instance.GetPacket(PacketType.ScriptQuestion);
@ -3108,6 +3107,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
OutPacket(scriptQuestion, ThrottleOutPacketType.Task); OutPacket(scriptQuestion, ThrottleOutPacketType.Task);
} }
private void InitDefaultAnimations() private void InitDefaultAnimations()
{ {
} }
@ -3318,7 +3318,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
handlerUpdatePrimGroupScale = OnUpdatePrimGroupScale; handlerUpdatePrimGroupScale = OnUpdatePrimGroupScale;
if (handlerUpdatePrimGroupScale != null) if (handlerUpdatePrimGroupScale != null)
{ {
// Console.WriteLine("new scale is " + scale.X + " , " + scale.Y + " , " + scale.Z); // Console.WriteLine("new scale is " + scale.X + " , " + scale.Y + " , " + scale.Z);
handlerUpdatePrimGroupScale(localId, scale5, this); handlerUpdatePrimGroupScale(localId, scale5, this);
handlerUpdateVector = OnUpdatePrimGroupPosition; handlerUpdateVector = OnUpdatePrimGroupPosition;

6
OpenSim/Region/Environment/Modules/World/Sun/SunModule.cs
View File

@ -157,11 +157,8 @@ namespace OpenSim.Region.Environment.Modules
switch (m_mode) switch (m_mode)
{ {
case "T1": case "T1":
default: default:
case "SL": case "SL":
// Time taken to complete a cycle (day and season) // Time taken to complete a cycle (day and season)
@ -196,7 +193,6 @@ namespace OpenSim.Region.Environment.Modules
m_log.Debug("[SUN] Positional data updated every "+m_frame_mod+" frames"); m_log.Debug("[SUN] Positional data updated every "+m_frame_mod+" frames");
break; break;
} }
} }
@ -237,7 +233,6 @@ namespace OpenSim.Region.Environment.Modules
public void SunUpdate() public void SunUpdate()
{ {
if (((m_frame++%m_frame_mod) != 0) || !ready) if (((m_frame++%m_frame_mod) != 0) || !ready)
{ {
return; return;
@ -253,7 +248,6 @@ namespace OpenSim.Region.Environment.Modules
// set estate settings for region access to sun position // set estate settings for region access to sun position
m_scene.RegionInfo.EstateSettings.sunPosition = Position; m_scene.RegionInfo.EstateSettings.sunPosition = Position;
} }
/// <summary> /// <summary>

1
OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
View File

@ -568,6 +568,7 @@ namespace OpenSim.Region.Environment.Scenes
// assume local regions are always up // assume local regions are always up
destRegionUp = true; destRegionUp = true;
} }
if (destRegionUp) if (destRegionUp)
{ {
avatar.Close(); avatar.Close();

3
OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
View File

@ -1170,9 +1170,8 @@ namespace OpenSim.Region.Physics.OdePlugin
if (m_usePID) if (m_usePID)
{ {
// If we're using the PID controller, then we have no gravity // If we're using the PID controller, then we have no gravity
fz = ((9.8f) * this.Mass ); fz = 9.8f * this.Mass;
// no lock; for now it's only called from within Simulate() // no lock; for now it's only called from within Simulate()

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

@ -3346,7 +3346,6 @@ namespace OpenSim.Region.ScriptEngine.Common
} }
return ret; return ret;
} }
/// <summary> /// <summary>
@ -3435,7 +3434,6 @@ namespace OpenSim.Region.ScriptEngine.Common
if (src.Length != stride && src.Length%stride == 0) if (src.Length != stride && src.Length%stride == 0)
{ {
chunkk = src.Length/stride; chunkk = src.Length/stride;
chunks = new int[chunkk]; chunks = new int[chunkk];
@ -3462,9 +3460,12 @@ namespace OpenSim.Region.ScriptEngine.Common
result = new LSL_Types.list(); result = new LSL_Types.list();
for (int i = 0; i < chunkk; i++) for (int i = 0; i < chunkk; i++)
{
for (int j = 0; j < stride; j++) for (int j = 0; j < stride; j++)
{
result.Add(src.Data[chunks[i]*stride+j]); result.Add(src.Data[chunks[i]*stride+j]);
}
}
} }
else { else {
object[] array = new object[src.Length]; object[] array = new object[src.Length];
@ -3540,6 +3541,7 @@ namespace OpenSim.Region.ScriptEngine.Common
stride = 1; stride = 1;
if (stride > 0) if (stride > 0)
{
for (int i = 0; i < src.Length; i += stride) for (int i = 0; i < src.Length; i += stride)
{ {
if (i<=ei[0] && i>=si[0]) if (i<=ei[0] && i>=si[0])
@ -3547,7 +3549,9 @@ namespace OpenSim.Region.ScriptEngine.Common
if (twopass && i>=si[1] && i<=ei[1]) if (twopass && i>=si[1] && i<=ei[1])
result.Add(src.Data[i]); result.Add(src.Data[i]);
} }
}
else if (stride < 0) else if (stride < 0)
{
for (int i = src.Length - 1; i >= 0; i += stride) for (int i = src.Length - 1; i >= 0; i += stride)
{ {
if (i <= ei[0] && i >= si[0]) if (i <= ei[0] && i >= si[0])
@ -3556,9 +3560,9 @@ namespace OpenSim.Region.ScriptEngine.Common
result.Add(src.Data[i]); result.Add(src.Data[i]);
} }
} }
}
return result; return result;
} }
public LSL_Types.Vector3 llGetRegionCorner() public LSL_Types.Vector3 llGetRegionCorner()
@ -5339,7 +5343,8 @@ namespace OpenSim.Region.ScriptEngine.Common
// All entries are initially valid // All entries are initially valid
for(int i=0; i<mlen; i++) active[i] = true; for (int i = 0; i < mlen; i++)
active[i] = true;
offset[mlen] = srclen; offset[mlen] = srclen;
@ -5359,7 +5364,8 @@ namespace OpenSim.Region.ScriptEngine.Common
{ {
// not present at all // not present at all
active[j] = false; active[j] = false;
} else }
else
{ {
// present and correct // present and correct
if (offset[j] < offset[best]) if (offset[j] < offset[best])

8
OpenSim/Region/ScriptEngine/Common/LSL_Types.cs
View File

@ -624,8 +624,8 @@ namespace OpenSim.Region.ScriptEngine.Common
Array.Copy(Data, 0, ret, 0, Data.Length); Array.Copy(Data, 0, ret, 0, Data.Length);
keys=new string[Data.Length]; keys=new string[Data.Length];
int k;
for(k=0;k<Data.Length;k++) for (int k = 0; k < Data.Length; k++)
keys[k] = Data[k].ToString(); keys[k] = Data[k].ToString();
Array.Sort(keys, ret); Array.Sort(keys, ret);
@ -672,10 +672,8 @@ namespace OpenSim.Region.ScriptEngine.Common
Object[] sorted=new Object[stride*vals.Length]; Object[] sorted=new Object[stride*vals.Length];
int j;
for (i = 0; i < vals.Length; i++) for (i = 0; i < vals.Length; i++)
for(j=0;j<stride;j++) for (int j = 0; j < stride; j++)
sorted[i*stride+j] = vals[i][j]; sorted[i*stride+j] = vals[i][j];
return new list(sorted); return new list(sorted);

9
OpenSim/Tests/Common/VectorToleranceConstraint.cs
View File

@ -61,14 +61,9 @@ namespace OpenSim.Tests.Common
_valueToBeTested = (LLVector3) valueToBeTested; _valueToBeTested = (LLVector3) valueToBeTested;
if ( IsWithinDoubleConstraint(_valueToBeTested.X,_baseValue.X) && return (IsWithinDoubleConstraint(_valueToBeTested.X, _baseValue.X) &&
IsWithinDoubleConstraint(_valueToBeTested.Y, _baseValue.Y) && IsWithinDoubleConstraint(_valueToBeTested.Y, _baseValue.Y) &&
IsWithinDoubleConstraint(_valueToBeTested.Z,_baseValue.Z) ) IsWithinDoubleConstraint(_valueToBeTested.Z, _baseValue.Z));
{
return true;
}
return false;
} }
public override void WriteDescriptionTo(MessageWriter writer) public override void WriteDescriptionTo(MessageWriter writer)

5
OpenSim/Tests/Inventory/TestInventory.cs
View File

@ -147,12 +147,11 @@ namespace OpenSim.Test.Inventory
Assert.IsNotNull(folders, "Failed to get rootfolders for user"); Assert.IsNotNull(folders, "Failed to get rootfolders for user");
bool foundRoot = false; bool foundRoot = false;
foreach(InventoryFolderBase f in folders) { foreach (InventoryFolderBase f in folders)
{
// a root folder has a zero valued LLUUID // a root folder has a zero valued LLUUID
Assert.AreEqual(f.parentID, LLUUID.Zero, "non root folder returned"); Assert.AreEqual(f.parentID, LLUUID.Zero, "non root folder returned");
if (f.agentID == root.agentID) if (f.agentID == root.agentID)
{ {
// we cannot have two different user specific root folders // we cannot have two different user specific root folders