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

Minor formatting cleanup.

0.6.0-stable
Jeff Ames 2008-06-06 01:19:15 +00:00
parent 67e06fa3f6
commit fbd37c420f
9 changed files with 37 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
View File

@ -474,10 +474,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
clientCircuits_reverse.Remove(circuitcode); clientCircuits_reverse.Remove(circuitcode);
lock(clientCircuits) { lock (clientCircuits) {
clientCircuits.Remove(sendto); clientCircuits.Remove(sendto);
} }
lock(proxyCircuits) { lock (proxyCircuits) {
proxyCircuits.Remove(circuitcode); proxyCircuits.Remove(circuitcode);
} }
} }

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

@ -1324,7 +1324,7 @@ namespace OpenSim.Region.Environment.Scenes
void AdaptTree(ref PrimitiveBaseShape tree) void AdaptTree(ref PrimitiveBaseShape tree)
{ {
// Tree size has to be adapted depending on its type // Tree size has to be adapted depending on its type
switch((Tree)tree.State) switch ((Tree)tree.State)
{ {
case Tree.Cypress1: case Tree.Cypress1:
case Tree.Cypress2: case Tree.Cypress2:

12
OpenSim/Region/ScriptEngine/XEngine/EventManager.cs
View File

@ -84,11 +84,11 @@ namespace OpenSim.Region.ScriptEngine.XEngine
SceneObjectPart part = myScriptEngine.World.GetSceneObjectPart( SceneObjectPart part = myScriptEngine.World.GetSceneObjectPart(
localID); localID);
if(part == null) if (part == null)
return; return;
det[0].LinkNum = 0; det[0].LinkNum = 0;
if(part.ParentGroup.Children.Count > 0) if (part.ParentGroup.Children.Count > 0)
det[0].LinkNum = part.LinkNum + 1; det[0].LinkNum = part.LinkNum + 1;
myScriptEngine.PostObjectEvent(localID, new XEventParams( myScriptEngine.PostObjectEvent(localID, new XEventParams(
@ -109,11 +109,11 @@ namespace OpenSim.Region.ScriptEngine.XEngine
SceneObjectPart part = myScriptEngine.World.GetSceneObjectPart( SceneObjectPart part = myScriptEngine.World.GetSceneObjectPart(
localID); localID);
if(part == null) if (part == null)
return; return;
det[0].LinkNum = 0; det[0].LinkNum = 0;
if(part.ParentGroup.Children.Count > 0) if (part.ParentGroup.Children.Count > 0)
det[0].LinkNum = part.LinkNum + 1; det[0].LinkNum = part.LinkNum + 1;
myScriptEngine.PostObjectEvent(localID, new XEventParams( myScriptEngine.PostObjectEvent(localID, new XEventParams(
@ -130,11 +130,11 @@ namespace OpenSim.Region.ScriptEngine.XEngine
SceneObjectPart part = myScriptEngine.World.GetSceneObjectPart( SceneObjectPart part = myScriptEngine.World.GetSceneObjectPart(
localID); localID);
if(part == null) if (part == null)
return; return;
det[0].LinkNum = 0; det[0].LinkNum = 0;
if(part.ParentGroup.Children.Count > 0) if (part.ParentGroup.Children.Count > 0)
det[0].LinkNum = part.LinkNum + 1; det[0].LinkNum = part.LinkNum + 1;
myScriptEngine.PostObjectEvent(localID, new XEventParams( myScriptEngine.PostObjectEvent(localID, new XEventParams(

6
OpenSim/Region/ScriptEngine/XEngine/LSL_ScriptCommands.cs
View File

@ -661,7 +661,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
{ {
m_host.AddScriptLPS(1); m_host.AddScriptLPS(1);
XDetectParams parms = m_ScriptEngine.GetDetectParams(m_itemID, number); XDetectParams parms = m_ScriptEngine.GetDetectParams(m_itemID, number);
if(parms == null) if (parms == null)
return new LSL_Types.Vector3(0, 0, 0); return new LSL_Types.Vector3(0, 0, 0);
return parms.OffsetPos; return parms.OffsetPos;
@ -688,7 +688,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
{ {
m_host.AddScriptLPS(1); m_host.AddScriptLPS(1);
XDetectParams parms = m_ScriptEngine.GetDetectParams(m_itemID, number); XDetectParams parms = m_ScriptEngine.GetDetectParams(m_itemID, number);
if(parms == null) if (parms == null)
return new LSL_Types.LSLInteger(0); return new LSL_Types.LSLInteger(0);
return new LSL_Types.LSLInteger(parms.LinkNum); return new LSL_Types.LSLInteger(parms.LinkNum);
@ -2578,7 +2578,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
UserAgentData userAgent = UserAgentData userAgent =
World.CommsManager.UserService.GetAgentByUUID(id); World.CommsManager.UserService.GetAgentByUUID(id);
if(userProfile == null || userAgent == null) if (userProfile == null || userAgent == null)
return LLUUID.Zero.ToString(); return LLUUID.Zero.ToString();
string reply = String.Empty; string reply = String.Empty;

2
OpenSim/Region/ScriptEngine/XEngine/Script/BuiltIn_Commands_BaseClass.cs
View File

@ -83,7 +83,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine.Script
{ {
Dictionary<string, object> vars = new Dictionary<string, object>(); Dictionary<string, object> vars = new Dictionary<string, object>();
if(m_Fields == null) if (m_Fields == null)
return vars; return vars;
m_Fields.Clear(); m_Fields.Clear();

12
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
View File

@ -395,13 +395,13 @@ namespace OpenSim.Region.ScriptEngine.XEngine
m_Scripts[itemID] = instance; m_Scripts[itemID] = instance;
} }
if(!m_PrimObjects.ContainsKey(localID)) if (!m_PrimObjects.ContainsKey(localID))
m_PrimObjects[localID] = new List<LLUUID>(); m_PrimObjects[localID] = new List<LLUUID>();
if(!m_PrimObjects[localID].Contains(itemID)) if (!m_PrimObjects[localID].Contains(itemID))
m_PrimObjects[localID].Add(itemID); m_PrimObjects[localID].Add(itemID);
if(!m_Assemblies.ContainsKey(assetID)) if (!m_Assemblies.ContainsKey(assetID))
m_Assemblies[assetID] = assembly; m_Assemblies[assetID] = assembly;
} }
return true; return true;
@ -930,14 +930,14 @@ namespace OpenSim.Region.ScriptEngine.XEngine
result = m_CurrentResult; result = m_CurrentResult;
} }
if(result == null) if (result == null)
return true; return true;
result.Abort(); result.Abort();
if(SmartThreadPool.WaitAll(new IWorkItemResult[] {result}, new TimeSpan((long)10000000), false)) if (SmartThreadPool.WaitAll(new IWorkItemResult[] {result}, new TimeSpan((long)10000000), false))
{ {
lock(m_EventQueue) lock (m_EventQueue)
{ {
m_CurrentResult = null; m_CurrentResult = null;
} }

28
OpenSim/Tests/OpenSim/Region/ScriptEngine/LSL_TypesTestLSLFloat.cs
View File

@ -57,7 +57,7 @@ namespace OpenSim.Region.ScriptEngine.Common.Tests
LSL_Types.LSLFloat testFloat; LSL_Types.LSLFloat testFloat;
foreach(KeyValuePair<int, double> number in numberSet) foreach (KeyValuePair<int, double> number in numberSet)
{ {
testFloat = new LSL_Types.LSLFloat(number.Key); testFloat = new LSL_Types.LSLFloat(number.Key);
Assert.That(testFloat.value, new DoubleToleranceConstraint(number.Value, _lowPrecisionTolerance)); Assert.That(testFloat.value, new DoubleToleranceConstraint(number.Value, _lowPrecisionTolerance));
@ -94,7 +94,7 @@ namespace OpenSim.Region.ScriptEngine.Common.Tests
LSL_Types.LSLFloat testFloat; LSL_Types.LSLFloat testFloat;
foreach(KeyValuePair<double, double> number in numberSet) foreach (KeyValuePair<double, double> number in numberSet)
{ {
testFloat = new LSL_Types.LSLFloat(number.Key); testFloat = new LSL_Types.LSLFloat(number.Key);
Assert.That(testFloat.value, new DoubleToleranceConstraint(number.Value, _lowPrecisionTolerance)); Assert.That(testFloat.value, new DoubleToleranceConstraint(number.Value, _lowPrecisionTolerance));
@ -131,7 +131,7 @@ namespace OpenSim.Region.ScriptEngine.Common.Tests
int testNumber; int testNumber;
foreach(KeyValuePair<double, int> number in numberSet) foreach (KeyValuePair<double, int> number in numberSet)
{ {
testNumber = new LSL_Types.LSLFloat(number.Key); testNumber = new LSL_Types.LSLFloat(number.Key);
Assert.AreEqual(number.Value, testNumber, "Converting double " + number.Key + ", expecting int " + number.Value); Assert.AreEqual(number.Value, testNumber, "Converting double " + number.Key + ", expecting int " + number.Value);
@ -168,7 +168,7 @@ namespace OpenSim.Region.ScriptEngine.Common.Tests
uint testNumber; uint testNumber;
foreach(KeyValuePair<double, int> number in numberSet) foreach (KeyValuePair<double, int> number in numberSet)
{ {
testNumber = new LSL_Types.LSLFloat(number.Key); testNumber = new LSL_Types.LSLFloat(number.Key);
Assert.AreEqual(number.Value, testNumber, "Converting double " + number.Key + ", expecting uint " + number.Value); Assert.AreEqual(number.Value, testNumber, "Converting double " + number.Key + ", expecting uint " + number.Value);
@ -205,7 +205,7 @@ namespace OpenSim.Region.ScriptEngine.Common.Tests
LSL_Types.LSLFloat testFloat; LSL_Types.LSLFloat testFloat;
bool testBool; bool testBool;
foreach(double number in numberList) foreach (double number in numberList)
{ {
testFloat = new LSL_Types.LSLFloat(number); testFloat = new LSL_Types.LSLFloat(number);
testBool = testFloat; testBool = testFloat;
@ -244,7 +244,7 @@ namespace OpenSim.Region.ScriptEngine.Common.Tests
LSL_Types.LSLFloat testFloat; LSL_Types.LSLFloat testFloat;
foreach(int number in numberList) foreach (int number in numberList)
{ {
testFloat = number; testFloat = number;
Assert.That(testFloat.value, new DoubleToleranceConstraint(number, _lowPrecisionTolerance)); Assert.That(testFloat.value, new DoubleToleranceConstraint(number, _lowPrecisionTolerance));
@ -281,7 +281,7 @@ namespace OpenSim.Region.ScriptEngine.Common.Tests
LSL_Types.LSLFloat testFloat; LSL_Types.LSLFloat testFloat;
foreach(KeyValuePair<string, double> number in numberSet) foreach (KeyValuePair<string, double> number in numberSet)
{ {
testFloat = number.Key; testFloat = number.Key;
Assert.That(testFloat.value, new DoubleToleranceConstraint(number.Value, _lowPrecisionTolerance)); Assert.That(testFloat.value, new DoubleToleranceConstraint(number.Value, _lowPrecisionTolerance));
@ -318,7 +318,7 @@ namespace OpenSim.Region.ScriptEngine.Common.Tests
LSL_Types.LSLFloat testFloat; LSL_Types.LSLFloat testFloat;
foreach(double number in numberList) foreach (double number in numberList)
{ {
testFloat = number; testFloat = number;
Assert.That(testFloat.value, new DoubleToleranceConstraint(number, _lowPrecisionTolerance)); Assert.That(testFloat.value, new DoubleToleranceConstraint(number, _lowPrecisionTolerance));
@ -355,7 +355,7 @@ namespace OpenSim.Region.ScriptEngine.Common.Tests
LSL_Types.LSLFloat testFloatA, testFloatB; LSL_Types.LSLFloat testFloatA, testFloatB;
foreach(double number in numberList) foreach (double number in numberList)
{ {
testFloatA = new LSL_Types.LSLFloat(number); testFloatA = new LSL_Types.LSLFloat(number);
testFloatB = new LSL_Types.LSLFloat(number); testFloatB = new LSL_Types.LSLFloat(number);
@ -396,7 +396,7 @@ namespace OpenSim.Region.ScriptEngine.Common.Tests
LSL_Types.LSLFloat testFloatA, testFloatB; LSL_Types.LSLFloat testFloatA, testFloatB;
foreach(double number in numberList) foreach (double number in numberList)
{ {
testFloatA = new LSL_Types.LSLFloat(number); testFloatA = new LSL_Types.LSLFloat(number);
testFloatB = new LSL_Types.LSLFloat(number + 1.0); testFloatB = new LSL_Types.LSLFloat(number + 1.0);
@ -438,7 +438,7 @@ namespace OpenSim.Region.ScriptEngine.Common.Tests
LSL_Types.LSLFloat testFloat; LSL_Types.LSLFloat testFloat;
double testNumber; double testNumber;
foreach(double number in numberList) foreach (double number in numberList)
{ {
testFloat = new LSL_Types.LSLFloat(number); testFloat = new LSL_Types.LSLFloat(number);
@ -484,7 +484,7 @@ namespace OpenSim.Region.ScriptEngine.Common.Tests
LSL_Types.LSLFloat testFloat; LSL_Types.LSLFloat testFloat;
double testNumber; double testNumber;
foreach(double number in numberList) foreach (double number in numberList)
{ {
testFloat = new LSL_Types.LSLFloat(number); testFloat = new LSL_Types.LSLFloat(number);
@ -530,7 +530,7 @@ namespace OpenSim.Region.ScriptEngine.Common.Tests
double testNumber; double testNumber;
LSL_Types.LSLFloat testFloat; LSL_Types.LSLFloat testFloat;
foreach(double number in numberList) foreach (double number in numberList)
{ {
testFloat = new LSL_Types.LSLFloat(number); testFloat = new LSL_Types.LSLFloat(number);
testNumber = testFloat; testNumber = testFloat;
@ -569,7 +569,7 @@ namespace OpenSim.Region.ScriptEngine.Common.Tests
LSL_Types.LSLFloat testFloat; LSL_Types.LSLFloat testFloat;
foreach(KeyValuePair<double, string> number in numberSet) foreach (KeyValuePair<double, string> number in numberSet)
{ {
testFloat = new LSL_Types.LSLFloat(number.Key); testFloat = new LSL_Types.LSLFloat(number.Key);
Assert.AreEqual(number.Value, testFloat.ToString()); Assert.AreEqual(number.Value, testFloat.ToString());

4
OpenSim/Tests/OpenSim/Region/ScriptEngine/LSL_TypesTestLSLString.cs
View File

@ -65,7 +65,7 @@ namespace OpenSim.Region.ScriptEngine.Common.Tests
LSL_Types.LSLString testString; LSL_Types.LSLString testString;
foreach(KeyValuePair<double, string> number in numberSet) foreach (KeyValuePair<double, string> number in numberSet)
{ {
testString = new LSL_Types.LSLString(new LSL_Types.LSLFloat(number.Key)); testString = new LSL_Types.LSLString(new LSL_Types.LSLFloat(number.Key));
Assert.AreEqual(number.Value, testString.m_string); Assert.AreEqual(number.Value, testString.m_string);
@ -102,7 +102,7 @@ namespace OpenSim.Region.ScriptEngine.Common.Tests
LSL_Types.LSLString testString; LSL_Types.LSLString testString;
foreach(KeyValuePair<double, string> number in numberSet) foreach (KeyValuePair<double, string> number in numberSet)
{ {
testString = (LSL_Types.LSLString) new LSL_Types.LSLFloat(number.Key); testString = (LSL_Types.LSLString) new LSL_Types.LSLFloat(number.Key);
Assert.AreEqual(number.Value, testString.m_string); Assert.AreEqual(number.Value, testString.m_string);