Merge branch 'master' into careminster

2 files changed, 6 insertions, 6 deletions

diff --git a/OpenSim/Region/CoreModules/Scripting/ScriptModuleComms/ScriptModuleCommsModule.cs b/OpenSim/Region/CoreModules/Scripting/ScriptModuleComms/ScriptModuleCommsModule.cs
index f6e1d39..6bf50d2 100644
--- a/OpenSim/Region/CoreModules/Scripting/ScriptModuleComms/ScriptModuleCommsModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/ScriptModuleComms/ScriptModuleCommsModule.cs
@@ -41,7 +41,7 @@ using System.Linq.Expressions;
 namespace OpenSim.Region.CoreModules.Scripting.ScriptModuleComms
 {
     [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "ScriptModuleCommsModule")]
-    class ScriptModuleCommsModule : INonSharedRegionModule, IScriptModuleComms
+    public class ScriptModuleCommsModule : INonSharedRegionModule, IScriptModuleComms
     {
         private static readonly ILog m_log =
             LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
diff --git a/OpenSim/Region/CoreModules/World/Objects/Commands/ObjectCommandsModule.cs b/OpenSim/Region/CoreModules/World/Objects/Commands/ObjectCommandsModule.cs
index 7b235ae..9fc2daf 100644
--- a/OpenSim/Region/CoreModules/World/Objects/Commands/ObjectCommandsModule.cs
+++ b/OpenSim/Region/CoreModules/World/Objects/Commands/ObjectCommandsModule.cs
@@ -592,11 +592,11 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands
                 cdl.AddRow(
                     "LightColor", 
                     string.Format("<{0},{1},{2},{3}>", s.LightColorR, s.LightColorB, s.LightColorG, s.LightColorA));
-                cdl.AddRow("FlexiDrag", s.LightCutoff);
-                cdl.AddRow("FlexiDrag", s.LightEntry);
-                cdl.AddRow("FlexiDrag", s.LightFalloff);
-                cdl.AddRow("FlexiDrag", s.LightIntensity);
-                cdl.AddRow("FlexiDrag", s.LightRadius);
+                cdl.AddRow("LightCutoff", s.LightCutoff);
+                cdl.AddRow("LightEntry", s.LightEntry);
+                cdl.AddRow("LightFalloff", s.LightFalloff);
+                cdl.AddRow("LightIntensity", s.LightIntensity);
+                cdl.AddRow("LightRadius", s.LightRadius);
                 cdl.AddRow("Media", string.Format("{0} entries", s.Media != null ? s.Media.Count.ToString() : "n/a"));
                 cdl.AddRow("PathBegin", s.PathBegin);
                 cdl.AddRow("PathEnd", s.PathEnd);