Merge branch 'master' into careminster-presence-refactor

2 files changed, 6 insertions, 6 deletions

diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/CM_Constants.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/CM_Constants.cs
index 522c020..f94ef4a 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/CM_Constants.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/CM_Constants.cs
@@ -70,7 +70,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
         public const int WL_CLOUD_SCROLL_Y = 32;
         public const int WL_CLOUD_SCROLL_Y_LOCK = 33;
         public const int WL_CLOUD_SCROLL_X_LOCK = 34;
-        public const int WL_DRAW_CLASSIC_CLOUDS = 35;

+        public const int WL_DRAW_CLASSIC_CLOUDS = 35;
         public const int WL_SUN_MOON_POSITION = 36;
 
     }
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/CM_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/CM_Stub.cs
index 5bc3a88..c0edaae 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/CM_Stub.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/CM_Stub.cs
@@ -66,11 +66,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
         public int cmSetWindlightScene(LSL_List rules)
         {
             return m_CM_Functions.cmSetWindlightScene(rules);
-        }

-

-        public int cmSetWindlightSceneTargeted(LSL_List rules, key target)

-        {

-            return m_CM_Functions.cmSetWindlightSceneTargeted(rules, target);

+        }
+
+        public int cmSetWindlightSceneTargeted(LSL_List rules, key target)
+        {
+            return m_CM_Functions.cmSetWindlightSceneTargeted(rules, target);
         }
     }
 }