aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorCasperW2010-02-05 00:53:32 +0100
committerCasperW2010-02-05 00:53:32 +0100
commit044979066cf66e4dcd2c8f4be90337555dc0b34d (patch)
tree58ae0b0ee1859e47fd0b5892ca6c664a4fa3dce5 /OpenSim
parentMerge branch 'master' into careminster (diff)
downloadopensim-SC-044979066cf66e4dcd2c8f4be90337555dc0b34d.zip
opensim-SC-044979066cf66e4dcd2c8f4be90337555dc0b34d.tar.gz
opensim-SC-044979066cf66e4dcd2c8f4be90337555dc0b34d.tar.bz2
opensim-SC-044979066cf66e4dcd2c8f4be90337555dc0b34d.tar.xz
Fix two inconsistencies with LightShare
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/CM_Api.cs6
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Runtime/CM_Constants.cs3
2 files changed, 7 insertions, 2 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/CM_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/CM_Api.cs
index d4250c1..99973b4 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/CM_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/CM_Api.cs
@@ -244,6 +244,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
244 LSL_Types.Vector3 iV; 244 LSL_Types.Vector3 iV;
245 switch (rule) 245 switch (rule)
246 { 246 {
247 case (int)ScriptBaseClass.WL_SUN_MOON_POSITION:
248 idx++;
249 wl.sunMoonPosition = (float)rules.GetLSLFloatItem(idx);
250 break;
247 case (int)ScriptBaseClass.WL_AMBIENT: 251 case (int)ScriptBaseClass.WL_AMBIENT:
248 idx++; 252 idx++;
249 iQ = rules.GetQuaternionItem(idx); 253 iQ = rules.GetQuaternionItem(idx);
@@ -300,7 +304,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
300 case (int)ScriptBaseClass.WL_CLOUD_XY_DENSITY: 304 case (int)ScriptBaseClass.WL_CLOUD_XY_DENSITY:
301 idx++; 305 idx++;
302 iV = rules.GetVector3Item(idx); 306 iV = rules.GetVector3Item(idx);
303 wl.cloudDetailXYDensity = new Vector3((float)iV.x, (float)iV.y, (float)iV.z); 307 wl.cloudXYDensity = new Vector3((float)iV.x, (float)iV.y, (float)iV.z);
304 break; 308 break;
305 case (int)ScriptBaseClass.WL_DENSITY_MULTIPLIER: 309 case (int)ScriptBaseClass.WL_DENSITY_MULTIPLIER:
306 idx++; 310 idx++;
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/CM_Constants.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/CM_Constants.cs
index 7b67fa3..522c020 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/CM_Constants.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/CM_Constants.cs
@@ -70,7 +70,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
70 public const int WL_CLOUD_SCROLL_Y = 32; 70 public const int WL_CLOUD_SCROLL_Y = 32;
71 public const int WL_CLOUD_SCROLL_Y_LOCK = 33; 71 public const int WL_CLOUD_SCROLL_Y_LOCK = 33;
72 public const int WL_CLOUD_SCROLL_X_LOCK = 34; 72 public const int WL_CLOUD_SCROLL_X_LOCK = 34;
73 public const int WL_DRAW_CLASSIC_CLOUDS = 35; 73 public const int WL_DRAW_CLASSIC_CLOUDS = 35;
74 public const int WL_SUN_MOON_POSITION = 36;
74 75
75 } 76 }
76} 77}