aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Framework/Communications/Capabilities/LLSD.cs2
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs6
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/XEngine/EventManager.cs12
-rw-r--r--OpenSim/Region/ScriptEngine/XEngine/LSL_ScriptCommands.cs6
-rw-r--r--OpenSim/Region/ScriptEngine/XEngine/Script/BuiltIn_Commands_BaseClass.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/XEngine/XEngine.cs12
-rw-r--r--OpenSim/Tests/OpenSim/Region/ScriptEngine/LSL_TypesTestLSLFloat.cs28
-rw-r--r--OpenSim/Tests/OpenSim/Region/ScriptEngine/LSL_TypesTestLSLString.cs4
9 files changed, 37 insertions, 37 deletions
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSD.cs b/OpenSim/Framework/Communications/Capabilities/LLSD.cs
index bcf7a88..aa9951c 100644
--- a/OpenSim/Framework/Communications/Capabilities/LLSD.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSD.cs
@@ -676,4 +676,4 @@ namespace OpenSim.Framework.Communications.Capabilities
676 } 676 }
677 } 677 }
678 } 678 }
679} \ No newline at end of file 679}
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
index 53e92ae..4a56048 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
@@ -474,10 +474,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
474 474
475 clientCircuits_reverse.Remove(circuitcode); 475 clientCircuits_reverse.Remove(circuitcode);
476 476
477 lock(clientCircuits) { 477 lock (clientCircuits) {
478 clientCircuits.Remove(sendto); 478 clientCircuits.Remove(sendto);
479 } 479 }
480 lock(proxyCircuits) { 480 lock (proxyCircuits) {
481 proxyCircuits.Remove(circuitcode); 481 proxyCircuits.Remove(circuitcode);
482 } 482 }
483 } 483 }
@@ -523,4 +523,4 @@ namespace OpenSim.Region.ClientStack.LindenUDP
523 PacketServer.AddNewClient(userEP, useCircuit, m_assetCache, m_authenticateSessionsClass, proxyEP); 523 PacketServer.AddNewClient(userEP, useCircuit, m_assetCache, m_authenticateSessionsClass, proxyEP);
524 } 524 }
525 } 525 }
526} \ No newline at end of file 526}
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 725efb4..706be06 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -1324,7 +1324,7 @@ namespace OpenSim.Region.Environment.Scenes
1324 void AdaptTree(ref PrimitiveBaseShape tree) 1324 void AdaptTree(ref PrimitiveBaseShape tree)
1325 { 1325 {
1326 // Tree size has to be adapted depending on its type 1326 // Tree size has to be adapted depending on its type
1327 switch((Tree)tree.State) 1327 switch ((Tree)tree.State)
1328 { 1328 {
1329 case Tree.Cypress1: 1329 case Tree.Cypress1:
1330 case Tree.Cypress2: 1330 case Tree.Cypress2:
diff --git a/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs b/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs
index 59c54f0..06277a1 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs
@@ -84,11 +84,11 @@ namespace OpenSim.Region.ScriptEngine.XEngine
84 84
85 SceneObjectPart part = myScriptEngine.World.GetSceneObjectPart( 85 SceneObjectPart part = myScriptEngine.World.GetSceneObjectPart(
86 localID); 86 localID);
87 if(part == null) 87 if (part == null)
88 return; 88 return;
89 89
90 det[0].LinkNum = 0; 90 det[0].LinkNum = 0;
91 if(part.ParentGroup.Children.Count > 0) 91 if (part.ParentGroup.Children.Count > 0)
92 det[0].LinkNum = part.LinkNum + 1; 92 det[0].LinkNum = part.LinkNum + 1;
93 93
94 myScriptEngine.PostObjectEvent(localID, new XEventParams( 94 myScriptEngine.PostObjectEvent(localID, new XEventParams(
@@ -109,11 +109,11 @@ namespace OpenSim.Region.ScriptEngine.XEngine
109 109
110 SceneObjectPart part = myScriptEngine.World.GetSceneObjectPart( 110 SceneObjectPart part = myScriptEngine.World.GetSceneObjectPart(
111 localID); 111 localID);
112 if(part == null) 112 if (part == null)
113 return; 113 return;
114 114
115 det[0].LinkNum = 0; 115 det[0].LinkNum = 0;
116 if(part.ParentGroup.Children.Count > 0) 116 if (part.ParentGroup.Children.Count > 0)
117 det[0].LinkNum = part.LinkNum + 1; 117 det[0].LinkNum = part.LinkNum + 1;
118 118
119 myScriptEngine.PostObjectEvent(localID, new XEventParams( 119 myScriptEngine.PostObjectEvent(localID, new XEventParams(
@@ -130,11 +130,11 @@ namespace OpenSim.Region.ScriptEngine.XEngine
130 130
131 SceneObjectPart part = myScriptEngine.World.GetSceneObjectPart( 131 SceneObjectPart part = myScriptEngine.World.GetSceneObjectPart(
132 localID); 132 localID);
133 if(part == null) 133 if (part == null)
134 return; 134 return;
135 135
136 det[0].LinkNum = 0; 136 det[0].LinkNum = 0;
137 if(part.ParentGroup.Children.Count > 0) 137 if (part.ParentGroup.Children.Count > 0)
138 det[0].LinkNum = part.LinkNum + 1; 138 det[0].LinkNum = part.LinkNum + 1;
139 139
140 myScriptEngine.PostObjectEvent(localID, new XEventParams( 140 myScriptEngine.PostObjectEvent(localID, new XEventParams(
diff --git a/OpenSim/Region/ScriptEngine/XEngine/LSL_ScriptCommands.cs b/OpenSim/Region/ScriptEngine/XEngine/LSL_ScriptCommands.cs
index 1fb13a7..3fb0ff9 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/LSL_ScriptCommands.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/LSL_ScriptCommands.cs
@@ -661,7 +661,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
661 { 661 {
662 m_host.AddScriptLPS(1); 662 m_host.AddScriptLPS(1);
663 XDetectParams parms = m_ScriptEngine.GetDetectParams(m_itemID, number); 663 XDetectParams parms = m_ScriptEngine.GetDetectParams(m_itemID, number);
664 if(parms == null) 664 if (parms == null)
665 return new LSL_Types.Vector3(0, 0, 0); 665 return new LSL_Types.Vector3(0, 0, 0);
666 666
667 return parms.OffsetPos; 667 return parms.OffsetPos;
@@ -688,7 +688,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
688 { 688 {
689 m_host.AddScriptLPS(1); 689 m_host.AddScriptLPS(1);
690 XDetectParams parms = m_ScriptEngine.GetDetectParams(m_itemID, number); 690 XDetectParams parms = m_ScriptEngine.GetDetectParams(m_itemID, number);
691 if(parms == null) 691 if (parms == null)
692 return new LSL_Types.LSLInteger(0); 692 return new LSL_Types.LSLInteger(0);
693 693
694 return new LSL_Types.LSLInteger(parms.LinkNum); 694 return new LSL_Types.LSLInteger(parms.LinkNum);
@@ -2578,7 +2578,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
2578 UserAgentData userAgent = 2578 UserAgentData userAgent =
2579 World.CommsManager.UserService.GetAgentByUUID(id); 2579 World.CommsManager.UserService.GetAgentByUUID(id);
2580 2580
2581 if(userProfile == null || userAgent == null) 2581 if (userProfile == null || userAgent == null)
2582 return LLUUID.Zero.ToString(); 2582 return LLUUID.Zero.ToString();
2583 2583
2584 string reply = String.Empty; 2584 string reply = String.Empty;
diff --git a/OpenSim/Region/ScriptEngine/XEngine/Script/BuiltIn_Commands_BaseClass.cs b/OpenSim/Region/ScriptEngine/XEngine/Script/BuiltIn_Commands_BaseClass.cs
index 71fc0b6..f43eab8 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/Script/BuiltIn_Commands_BaseClass.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/Script/BuiltIn_Commands_BaseClass.cs
@@ -83,7 +83,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine.Script
83 { 83 {
84 Dictionary<string, object> vars = new Dictionary<string, object>(); 84 Dictionary<string, object> vars = new Dictionary<string, object>();
85 85
86 if(m_Fields == null) 86 if (m_Fields == null)
87 return vars; 87 return vars;
88 88
89 m_Fields.Clear(); 89 m_Fields.Clear();
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
index 2848441..05a4f76 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
@@ -395,13 +395,13 @@ namespace OpenSim.Region.ScriptEngine.XEngine
395 m_Scripts[itemID] = instance; 395 m_Scripts[itemID] = instance;
396 } 396 }
397 397
398 if(!m_PrimObjects.ContainsKey(localID)) 398 if (!m_PrimObjects.ContainsKey(localID))
399 m_PrimObjects[localID] = new List<LLUUID>(); 399 m_PrimObjects[localID] = new List<LLUUID>();
400 400
401 if(!m_PrimObjects[localID].Contains(itemID)) 401 if (!m_PrimObjects[localID].Contains(itemID))
402 m_PrimObjects[localID].Add(itemID); 402 m_PrimObjects[localID].Add(itemID);
403 403
404 if(!m_Assemblies.ContainsKey(assetID)) 404 if (!m_Assemblies.ContainsKey(assetID))
405 m_Assemblies[assetID] = assembly; 405 m_Assemblies[assetID] = assembly;
406 } 406 }
407 return true; 407 return true;
@@ -930,14 +930,14 @@ namespace OpenSim.Region.ScriptEngine.XEngine
930 result = m_CurrentResult; 930 result = m_CurrentResult;
931 } 931 }
932 932
933 if(result == null) 933 if (result == null)
934 return true; 934 return true;
935 935
936 result.Abort(); 936 result.Abort();
937 937
938 if(SmartThreadPool.WaitAll(new IWorkItemResult[] {result}, new TimeSpan((long)10000000), false)) 938 if (SmartThreadPool.WaitAll(new IWorkItemResult[] {result}, new TimeSpan((long)10000000), false))
939 { 939 {
940 lock(m_EventQueue) 940 lock (m_EventQueue)
941 { 941 {
942 m_CurrentResult = null; 942 m_CurrentResult = null;
943 } 943 }
diff --git a/OpenSim/Tests/OpenSim/Region/ScriptEngine/LSL_TypesTestLSLFloat.cs b/OpenSim/Tests/OpenSim/Region/ScriptEngine/LSL_TypesTestLSLFloat.cs
index 4af9df7..29d0e1c 100644
--- a/OpenSim/Tests/OpenSim/Region/ScriptEngine/LSL_TypesTestLSLFloat.cs
+++ b/OpenSim/Tests/OpenSim/Region/ScriptEngine/LSL_TypesTestLSLFloat.cs
@@ -57,7 +57,7 @@ namespace OpenSim.Region.ScriptEngine.Common.Tests
57 57
58 LSL_Types.LSLFloat testFloat; 58 LSL_Types.LSLFloat testFloat;
59 59
60 foreach(KeyValuePair<int, double> number in numberSet) 60 foreach (KeyValuePair<int, double> number in numberSet)
61 { 61 {
62 testFloat = new LSL_Types.LSLFloat(number.Key); 62 testFloat = new LSL_Types.LSLFloat(number.Key);
63 Assert.That(testFloat.value, new DoubleToleranceConstraint(number.Value, _lowPrecisionTolerance)); 63 Assert.That(testFloat.value, new DoubleToleranceConstraint(number.Value, _lowPrecisionTolerance));
@@ -94,7 +94,7 @@ namespace OpenSim.Region.ScriptEngine.Common.Tests
94 94
95 LSL_Types.LSLFloat testFloat; 95 LSL_Types.LSLFloat testFloat;
96 96
97 foreach(KeyValuePair<double, double> number in numberSet) 97 foreach (KeyValuePair<double, double> number in numberSet)
98 { 98 {
99 testFloat = new LSL_Types.LSLFloat(number.Key); 99 testFloat = new LSL_Types.LSLFloat(number.Key);
100 Assert.That(testFloat.value, new DoubleToleranceConstraint(number.Value, _lowPrecisionTolerance)); 100 Assert.That(testFloat.value, new DoubleToleranceConstraint(number.Value, _lowPrecisionTolerance));
@@ -131,7 +131,7 @@ namespace OpenSim.Region.ScriptEngine.Common.Tests
131 131
132 int testNumber; 132 int testNumber;
133 133
134 foreach(KeyValuePair<double, int> number in numberSet) 134 foreach (KeyValuePair<double, int> number in numberSet)
135 { 135 {
136 testNumber = new LSL_Types.LSLFloat(number.Key); 136 testNumber = new LSL_Types.LSLFloat(number.Key);
137 Assert.AreEqual(number.Value, testNumber, "Converting double " + number.Key + ", expecting int " + number.Value); 137 Assert.AreEqual(number.Value, testNumber, "Converting double " + number.Key + ", expecting int " + number.Value);
@@ -168,7 +168,7 @@ namespace OpenSim.Region.ScriptEngine.Common.Tests
168 168
169 uint testNumber; 169 uint testNumber;
170 170
171 foreach(KeyValuePair<double, int> number in numberSet) 171 foreach (KeyValuePair<double, int> number in numberSet)
172 { 172 {
173 testNumber = new LSL_Types.LSLFloat(number.Key); 173 testNumber = new LSL_Types.LSLFloat(number.Key);
174 Assert.AreEqual(number.Value, testNumber, "Converting double " + number.Key + ", expecting uint " + number.Value); 174 Assert.AreEqual(number.Value, testNumber, "Converting double " + number.Key + ", expecting uint " + number.Value);
@@ -205,7 +205,7 @@ namespace OpenSim.Region.ScriptEngine.Common.Tests
205 LSL_Types.LSLFloat testFloat; 205 LSL_Types.LSLFloat testFloat;
206 bool testBool; 206 bool testBool;
207 207
208 foreach(double number in numberList) 208 foreach (double number in numberList)
209 { 209 {
210 testFloat = new LSL_Types.LSLFloat(number); 210 testFloat = new LSL_Types.LSLFloat(number);
211 testBool = testFloat; 211 testBool = testFloat;
@@ -244,7 +244,7 @@ namespace OpenSim.Region.ScriptEngine.Common.Tests
244 244
245 LSL_Types.LSLFloat testFloat; 245 LSL_Types.LSLFloat testFloat;
246 246
247 foreach(int number in numberList) 247 foreach (int number in numberList)
248 { 248 {
249 testFloat = number; 249 testFloat = number;
250 Assert.That(testFloat.value, new DoubleToleranceConstraint(number, _lowPrecisionTolerance)); 250 Assert.That(testFloat.value, new DoubleToleranceConstraint(number, _lowPrecisionTolerance));
@@ -281,7 +281,7 @@ namespace OpenSim.Region.ScriptEngine.Common.Tests
281 281
282 LSL_Types.LSLFloat testFloat; 282 LSL_Types.LSLFloat testFloat;
283 283
284 foreach(KeyValuePair<string, double> number in numberSet) 284 foreach (KeyValuePair<string, double> number in numberSet)
285 { 285 {
286 testFloat = number.Key; 286 testFloat = number.Key;
287 Assert.That(testFloat.value, new DoubleToleranceConstraint(number.Value, _lowPrecisionTolerance)); 287 Assert.That(testFloat.value, new DoubleToleranceConstraint(number.Value, _lowPrecisionTolerance));
@@ -318,7 +318,7 @@ namespace OpenSim.Region.ScriptEngine.Common.Tests
318 318
319 LSL_Types.LSLFloat testFloat; 319 LSL_Types.LSLFloat testFloat;
320 320
321 foreach(double number in numberList) 321 foreach (double number in numberList)
322 { 322 {
323 testFloat = number; 323 testFloat = number;
324 Assert.That(testFloat.value, new DoubleToleranceConstraint(number, _lowPrecisionTolerance)); 324 Assert.That(testFloat.value, new DoubleToleranceConstraint(number, _lowPrecisionTolerance));
@@ -355,7 +355,7 @@ namespace OpenSim.Region.ScriptEngine.Common.Tests
355 355
356 LSL_Types.LSLFloat testFloatA, testFloatB; 356 LSL_Types.LSLFloat testFloatA, testFloatB;
357 357
358 foreach(double number in numberList) 358 foreach (double number in numberList)
359 { 359 {
360 testFloatA = new LSL_Types.LSLFloat(number); 360 testFloatA = new LSL_Types.LSLFloat(number);
361 testFloatB = new LSL_Types.LSLFloat(number); 361 testFloatB = new LSL_Types.LSLFloat(number);
@@ -396,7 +396,7 @@ namespace OpenSim.Region.ScriptEngine.Common.Tests
396 396
397 LSL_Types.LSLFloat testFloatA, testFloatB; 397 LSL_Types.LSLFloat testFloatA, testFloatB;
398 398
399 foreach(double number in numberList) 399 foreach (double number in numberList)
400 { 400 {
401 testFloatA = new LSL_Types.LSLFloat(number); 401 testFloatA = new LSL_Types.LSLFloat(number);
402 testFloatB = new LSL_Types.LSLFloat(number + 1.0); 402 testFloatB = new LSL_Types.LSLFloat(number + 1.0);
@@ -438,7 +438,7 @@ namespace OpenSim.Region.ScriptEngine.Common.Tests
438 LSL_Types.LSLFloat testFloat; 438 LSL_Types.LSLFloat testFloat;
439 double testNumber; 439 double testNumber;
440 440
441 foreach(double number in numberList) 441 foreach (double number in numberList)
442 { 442 {
443 testFloat = new LSL_Types.LSLFloat(number); 443 testFloat = new LSL_Types.LSLFloat(number);
444 444
@@ -484,7 +484,7 @@ namespace OpenSim.Region.ScriptEngine.Common.Tests
484 LSL_Types.LSLFloat testFloat; 484 LSL_Types.LSLFloat testFloat;
485 double testNumber; 485 double testNumber;
486 486
487 foreach(double number in numberList) 487 foreach (double number in numberList)
488 { 488 {
489 testFloat = new LSL_Types.LSLFloat(number); 489 testFloat = new LSL_Types.LSLFloat(number);
490 490
@@ -530,7 +530,7 @@ namespace OpenSim.Region.ScriptEngine.Common.Tests
530 double testNumber; 530 double testNumber;
531 LSL_Types.LSLFloat testFloat; 531 LSL_Types.LSLFloat testFloat;
532 532
533 foreach(double number in numberList) 533 foreach (double number in numberList)
534 { 534 {
535 testFloat = new LSL_Types.LSLFloat(number); 535 testFloat = new LSL_Types.LSLFloat(number);
536 testNumber = testFloat; 536 testNumber = testFloat;
@@ -569,7 +569,7 @@ namespace OpenSim.Region.ScriptEngine.Common.Tests
569 569
570 LSL_Types.LSLFloat testFloat; 570 LSL_Types.LSLFloat testFloat;
571 571
572 foreach(KeyValuePair<double, string> number in numberSet) 572 foreach (KeyValuePair<double, string> number in numberSet)
573 { 573 {
574 testFloat = new LSL_Types.LSLFloat(number.Key); 574 testFloat = new LSL_Types.LSLFloat(number.Key);
575 Assert.AreEqual(number.Value, testFloat.ToString()); 575 Assert.AreEqual(number.Value, testFloat.ToString());
diff --git a/OpenSim/Tests/OpenSim/Region/ScriptEngine/LSL_TypesTestLSLString.cs b/OpenSim/Tests/OpenSim/Region/ScriptEngine/LSL_TypesTestLSLString.cs
index 83c7e77..0bba14c 100644
--- a/OpenSim/Tests/OpenSim/Region/ScriptEngine/LSL_TypesTestLSLString.cs
+++ b/OpenSim/Tests/OpenSim/Region/ScriptEngine/LSL_TypesTestLSLString.cs
@@ -65,7 +65,7 @@ namespace OpenSim.Region.ScriptEngine.Common.Tests
65 65
66 LSL_Types.LSLString testString; 66 LSL_Types.LSLString testString;
67 67
68 foreach(KeyValuePair<double, string> number in numberSet) 68 foreach (KeyValuePair<double, string> number in numberSet)
69 { 69 {
70 testString = new LSL_Types.LSLString(new LSL_Types.LSLFloat(number.Key)); 70 testString = new LSL_Types.LSLString(new LSL_Types.LSLFloat(number.Key));
71 Assert.AreEqual(number.Value, testString.m_string); 71 Assert.AreEqual(number.Value, testString.m_string);
@@ -102,7 +102,7 @@ namespace OpenSim.Region.ScriptEngine.Common.Tests
102 102
103 LSL_Types.LSLString testString; 103 LSL_Types.LSLString testString;
104 104
105 foreach(KeyValuePair<double, string> number in numberSet) 105 foreach (KeyValuePair<double, string> number in numberSet)
106 { 106 {
107 testString = (LSL_Types.LSLString) new LSL_Types.LSLFloat(number.Key); 107 testString = (LSL_Types.LSLString) new LSL_Types.LSLFloat(number.Key);
108 Assert.AreEqual(number.Value, testString.m_string); 108 Assert.AreEqual(number.Value, testString.m_string);