aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
Diffstat (limited to '')
-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
6 files changed, 20 insertions, 20 deletions
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 }