Update svn properties, formatting cleanup.

3 files changed, 38 insertions, 39 deletions

diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
index 9fdf3ce..f10a854 100644
--- a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
+++ b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
@@ -2296,7 +2296,7 @@ namespace OpenSim.Region.ScriptEngine.Common
             bool found = false;
 
             float dist = (float)llVecDist(llGetPos(), pos);
-            if(dist > m_distanceFactor * 10.0f)
+            if (dist > m_distanceFactor * 10.0f)
                 return;
 
             // Instead of using return;, I'm using continue; because in our TaskInventory implementation
@@ -6247,7 +6247,7 @@ namespace OpenSim.Region.ScriptEngine.Common
                         switch (primType)
                         {
                             case BuiltIn_Commands_BaseClass.PRIM_TYPE_BOX:
-                            case BuiltIn_Commands_BaseClass.PRIM_TYPE_CYLINDER:                               
+                            case BuiltIn_Commands_BaseClass.PRIM_TYPE_CYLINDER:
                             case BuiltIn_Commands_BaseClass.PRIM_TYPE_PRISM:
                                 res.Add(new LSL_Types.LSLInteger(Shape.ProfileCurve));
                                 res.Add(new LSL_Types.Vector3(Shape.ProfileBegin / 50000.0, 1 - Shape.ProfileEnd / 50000.0, 0));
@@ -6298,10 +6298,10 @@ namespace OpenSim.Region.ScriptEngine.Common
                                 // vector tapera
                                 res.Add(new LSL_Types.Vector3(Shape.PathTaperX / 100.0, Shape.PathTaperY / 100.0, 0));
 
-                                // float revolutions, 
+                                // float revolutions,
                                 res.Add(new LSL_Types.LSLFloat(Shape.PathRevolutions / 50.0)); // needs fixing :(
 
-                                // float radiusoffset, 
+                                // float radiusoffset,
                                 res.Add(new LSL_Types.LSLFloat(Shape.PathRadiusOffset / 100.0));
 
                                 // float skew
@@ -7014,10 +7014,10 @@ namespace OpenSim.Region.ScriptEngine.Common
                 {
                     case 5: // DATA_SIM_POS
                         if (info == null)
-                                {
-                                    // ScriptSleep(1000);
-                                    return LLUUID.Zero.ToString();
-                                }
+                        {
+                            // ScriptSleep(1000);
+                            return LLUUID.Zero.ToString();
+                        }
                         reply = new LSL_Types.Vector3(
                             info.RegionLocX * Constants.RegionSize,
                             info.RegionLocY * Constants.RegionSize,
@@ -7031,10 +7031,10 @@ namespace OpenSim.Region.ScriptEngine.Common
                         break;
                     case 7: // DATA_SIM_RATING
                         if (info == null)
-                                {
-                                    // ScriptSleep(1000);
-                                    return LLUUID.Zero.ToString();
-                                }
+                        {
+                            // ScriptSleep(1000);
+                            return LLUUID.Zero.ToString();
+                        }
                         int access = info.RegionSettings.Maturity;
                         if (access == 0)
                             reply = "PG";
@@ -7047,18 +7047,18 @@ namespace OpenSim.Region.ScriptEngine.Common
                         reply = m_ScriptEngine.World.GetSimulatorVersion();
                         break;
                     default:
-                                // ScriptSleep(1000);
+                        // ScriptSleep(1000);
                         return LLUUID.Zero.ToString(); // Raise no event
                 }
                 LLUUID rq = LLUUID.Random();
 
-                    LLUUID tid = m_ScriptEngine.m_ASYNCLSLCommandManager.
-                            m_Dataserver.RegisterRequest(m_localID, m_itemID, rq.ToString());
+                LLUUID tid = m_ScriptEngine.m_ASYNCLSLCommandManager.
+                    m_Dataserver.RegisterRequest(m_localID, m_itemID, rq.ToString());
 
-                    m_ScriptEngine.m_ASYNCLSLCommandManager.
-                    m_Dataserver.DataserverReply(rq.ToString(), reply);
+                m_ScriptEngine.m_ASYNCLSLCommandManager.
+                m_Dataserver.DataserverReply(rq.ToString(), reply);
 
-                    // ScriptSleep(1000);
+                // ScriptSleep(1000);
                 return tid.ToString();
             }
             catch(Exception e)
@@ -8041,12 +8041,12 @@ namespace OpenSim.Region.ScriptEngine.Common
                 (line >= 0) &&
                 (line < notecardLines.Length))
             {
-                    // ScriptSleep(100);
+                // ScriptSleep(100);
                 return notecardLines[line];
             }
             else
             {
-                    // ScriptSleep(100);
+                // ScriptSleep(100);
                 return String.Empty;
             }
         }
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index b48edfb..b5ca167 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -2130,7 +2130,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         {
             float dist = (float)llVecMag(llGetPos() - pos);
 
-            if(dist > m_ScriptDistanceFactor * 10.0f)
+            if (dist > m_ScriptDistanceFactor * 10.0f)
                 return;
 
             m_host.AddScriptLPS(1);
@@ -5735,8 +5735,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                     case (int)ScriptBaseClass.PRIM_POINT_LIGHT:
                         if (remain < 5)
                             return;
-                        LSL_Types.LSLInteger light =  new LSL_Types.LSLInteger(rules.Data[idx++].ToString());
-                        LSL_Types.Vector3 lightcolor =new LSL_Types.Vector3(rules.Data[idx++].ToString());
+                        LSL_Types.LSLInteger light = new LSL_Types.LSLInteger(rules.Data[idx++].ToString());
+                        LSL_Types.Vector3 lightcolor = new LSL_Types.Vector3(rules.Data[idx++].ToString());
                         float intensity = (float)Convert.ToDouble(rules.Data[idx++]);
                         float radius = (float)Convert.ToDouble(rules.Data[idx++]);
                         float falloff = (float)Convert.ToDouble(rules.Data[idx++]);
@@ -6895,10 +6895,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 {
                     case 5: // DATA_SIM_POS
                         if (info == null)
-                                {
-                                    // ScriptSleep(1000);
-                                    return LLUUID.Zero.ToString();
-                                }
+                        {
+                            // ScriptSleep(1000);
+                            return LLUUID.Zero.ToString();
+                        }
                         reply = new LSL_Types.Vector3(
                             info.RegionLocX * Constants.RegionSize,
                             info.RegionLocY * Constants.RegionSize,
@@ -6912,10 +6912,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                         break;
                     case 7: // DATA_SIM_RATING
                         if (info == null)
-                                {
-                                    // ScriptSleep(1000);
-                                    return LLUUID.Zero.ToString();
-                                }
+                        {
+                            // ScriptSleep(1000);
+                            return LLUUID.Zero.ToString();
+                        }
                         int access = info.RegionSettings.Maturity;
                         if (access == 0)
                             reply = "PG";
@@ -6928,7 +6928,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                         reply = m_ScriptEngine.World.GetSimulatorVersion();
                         break;
                     default:
-                                // ScriptSleep(1000);
+                        // ScriptSleep(1000);
                         return LLUUID.Zero.ToString(); // Raise no event
                 }
                 LLUUID rq = LLUUID.Random();
@@ -6939,7 +6939,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 AsyncCommands.
                     DataserverPlugin.DataserverReply(rq.ToString(), reply);
 
-                    // ScriptSleep(1000);
+                // ScriptSleep(1000);
                 return tid.ToString();
             }
             catch(Exception e)
@@ -7910,7 +7910,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                         AsyncCommands.
                         DataserverPlugin.DataserverReply(item.AssetID.ToString(),
                                 NotecardCache.GetLines(item.AssetID).ToString());
-                                    // ScriptSleep(100);
+                        // ScriptSleep(100);
                         return tid.ToString();
                     }
                     WithNotecard(item.AssetID, delegate (LLUUID id, AssetBase a)
@@ -7924,7 +7924,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                                 DataserverPlugin.DataserverReply(id.ToString(),
                                 NotecardCache.GetLines(id).ToString());
                     });
-                            // ScriptSleep(100);
+                    // ScriptSleep(100);
                     return tid.ToString();
                 }
             }
@@ -7948,7 +7948,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                         AsyncCommands.
                         DataserverPlugin.DataserverReply(item.AssetID.ToString(),
                                 NotecardCache.GetLine(item.AssetID, line));
-                                    // ScriptSleep(100);
+                        // ScriptSleep(100);
                         return tid.ToString();
                     }
                     WithNotecard(item.AssetID, delegate (LLUUID id, AssetBase a)
@@ -7963,7 +7963,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                                 NotecardCache.GetLine(id, line));
                     });
 
-                            // ScriptSleep(100);
+                    // ScriptSleep(100);
                     return tid.ToString();
                 }
             }
diff --git a/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs b/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs
index 3a01dc6..d431286 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs
@@ -89,7 +89,6 @@ namespace OpenSim.Region.ScriptEngine.XEngine
             det[0].Key = remoteClient.AgentId;
             det[0].Populate(myScriptEngine.World);
 
-            
             if (originalID == 0)
             {
                 SceneObjectPart part = myScriptEngine.World.GetSceneObjectPart(localID);
@@ -103,7 +102,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
                 SceneObjectPart originalPart = myScriptEngine.World.GetSceneObjectPart(originalID);
                 det[0].LinkNum = originalPart.LinkNum;
             }
-            
+
             myScriptEngine.PostObjectEvent(localID, new EventParams(
                     "touch_start", new Object[] { new LSL_Types.LSLInteger(1) },
                     det));