diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 37 |
1 files changed, 17 insertions, 20 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index cf3270e..f9feb7f 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
@@ -6852,7 +6852,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
6852 | 6852 | ||
6853 | part.ScriptSetTemporaryStatus(tempOnRez); | 6853 | part.ScriptSetTemporaryStatus(tempOnRez); |
6854 | break; | 6854 | break; |
6855 | 6855 | ||
6856 | case (int)ScriptBaseClass.PRIM_TEXGEN: | 6856 | case (int)ScriptBaseClass.PRIM_TEXGEN: |
6857 | if (remain < 2) | 6857 | if (remain < 2) |
6858 | return; | 6858 | return; |
@@ -6894,7 +6894,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
6894 | } | 6894 | } |
6895 | } | 6895 | } |
6896 | 6896 | ||
6897 | |||
6898 | public LSL_String llXorBase64Strings(string str1, string str2) | 6897 | public LSL_String llXorBase64Strings(string str1, string str2) |
6899 | { | 6898 | { |
6900 | m_host.AddScriptLPS(1); | 6899 | m_host.AddScriptLPS(1); |
@@ -7215,7 +7214,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
7215 | // vector profilecut | 7214 | // vector profilecut |
7216 | res.Add(new LSL_Vector(Shape.ProfileBegin / 50000.0, 1 - Shape.ProfileEnd / 50000.0, 0)); | 7215 | res.Add(new LSL_Vector(Shape.ProfileBegin / 50000.0, 1 - Shape.ProfileEnd / 50000.0, 0)); |
7217 | 7216 | ||
7218 | |||
7219 | // vector tapera | 7217 | // vector tapera |
7220 | res.Add(new LSL_Vector(Shape.PathTaperX / 100.0, Shape.PathTaperY / 100.0, 0)); | 7218 | res.Add(new LSL_Vector(Shape.PathTaperX / 100.0, Shape.PathTaperY / 100.0, 0)); |
7221 | 7219 | ||
@@ -7228,7 +7226,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
7228 | // float skew | 7226 | // float skew |
7229 | res.Add(new LSL_Float(Shape.PathSkew / 100.0)); | 7227 | res.Add(new LSL_Float(Shape.PathSkew / 100.0)); |
7230 | break; | 7228 | break; |
7231 | |||
7232 | } | 7229 | } |
7233 | break; | 7230 | break; |
7234 | 7231 | ||
@@ -7246,11 +7243,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
7246 | 7243 | ||
7247 | res.Add(new LSL_String(texface.TextureID.ToString())); | 7244 | res.Add(new LSL_String(texface.TextureID.ToString())); |
7248 | res.Add(new LSL_Vector(texface.RepeatU, | 7245 | res.Add(new LSL_Vector(texface.RepeatU, |
7249 | texface.RepeatV, | 7246 | texface.RepeatV, |
7250 | 0)); | 7247 | 0)); |
7251 | res.Add(new LSL_Vector(texface.OffsetU, | 7248 | res.Add(new LSL_Vector(texface.OffsetU, |
7252 | texface.OffsetV, | 7249 | texface.OffsetV, |
7253 | 0)); | 7250 | 0)); |
7254 | res.Add(new LSL_Float(texface.Rotation)); | 7251 | res.Add(new LSL_Float(texface.Rotation)); |
7255 | } | 7252 | } |
7256 | } | 7253 | } |
@@ -7262,11 +7259,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
7262 | 7259 | ||
7263 | res.Add(new LSL_String(texface.TextureID.ToString())); | 7260 | res.Add(new LSL_String(texface.TextureID.ToString())); |
7264 | res.Add(new LSL_Vector(texface.RepeatU, | 7261 | res.Add(new LSL_Vector(texface.RepeatU, |
7265 | texface.RepeatV, | 7262 | texface.RepeatV, |
7266 | 0)); | 7263 | 0)); |
7267 | res.Add(new LSL_Vector(texface.OffsetU, | 7264 | res.Add(new LSL_Vector(texface.OffsetU, |
7268 | texface.OffsetV, | 7265 | texface.OffsetV, |
7269 | 0)); | 7266 | 0)); |
7270 | res.Add(new LSL_Float(texface.Rotation)); | 7267 | res.Add(new LSL_Float(texface.Rotation)); |
7271 | } | 7268 | } |
7272 | } | 7269 | } |
@@ -7286,8 +7283,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
7286 | { | 7283 | { |
7287 | texcolor = tex.GetFace((uint)face).RGBA; | 7284 | texcolor = tex.GetFace((uint)face).RGBA; |
7288 | res.Add(new LSL_Vector(texcolor.R, | 7285 | res.Add(new LSL_Vector(texcolor.R, |
7289 | texcolor.G, | 7286 | texcolor.G, |
7290 | texcolor.B)); | 7287 | texcolor.B)); |
7291 | res.Add(new LSL_Float(texcolor.A)); | 7288 | res.Add(new LSL_Float(texcolor.A)); |
7292 | } | 7289 | } |
7293 | } | 7290 | } |
@@ -7295,8 +7292,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
7295 | { | 7292 | { |
7296 | texcolor = tex.GetFace((uint)face).RGBA; | 7293 | texcolor = tex.GetFace((uint)face).RGBA; |
7297 | res.Add(new LSL_Vector(texcolor.R, | 7294 | res.Add(new LSL_Vector(texcolor.R, |
7298 | texcolor.G, | 7295 | texcolor.G, |
7299 | texcolor.B)); | 7296 | texcolor.B)); |
7300 | res.Add(new LSL_Float(texcolor.A)); | 7297 | res.Add(new LSL_Float(texcolor.A)); |
7301 | } | 7298 | } |
7302 | break; | 7299 | break; |
@@ -7335,8 +7332,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
7335 | res.Add(new LSL_Float(shape.FlexiWind)); // wind | 7332 | res.Add(new LSL_Float(shape.FlexiWind)); // wind |
7336 | res.Add(new LSL_Float(shape.FlexiTension)); // tension | 7333 | res.Add(new LSL_Float(shape.FlexiTension)); // tension |
7337 | res.Add(new LSL_Vector(shape.FlexiForceX, // force | 7334 | res.Add(new LSL_Vector(shape.FlexiForceX, // force |
7338 | shape.FlexiForceY, | 7335 | shape.FlexiForceY, |
7339 | shape.FlexiForceZ)); | 7336 | shape.FlexiForceZ)); |
7340 | break; | 7337 | break; |
7341 | 7338 | ||
7342 | case (int)ScriptBaseClass.PRIM_TEXGEN: | 7339 | case (int)ScriptBaseClass.PRIM_TEXGEN: |
@@ -7358,8 +7355,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
7358 | else | 7355 | else |
7359 | res.Add(new LSL_Integer(0)); | 7356 | res.Add(new LSL_Integer(0)); |
7360 | res.Add(new LSL_Vector(shape.LightColorR, // color | 7357 | res.Add(new LSL_Vector(shape.LightColorR, // color |
7361 | shape.LightColorG, | 7358 | shape.LightColorG, |
7362 | shape.LightColorB)); | 7359 | shape.LightColorB)); |
7363 | res.Add(new LSL_Float(shape.LightIntensity)); // intensity | 7360 | res.Add(new LSL_Float(shape.LightIntensity)); // intensity |
7364 | res.Add(new LSL_Float(shape.LightRadius)); // radius | 7361 | res.Add(new LSL_Float(shape.LightRadius)); // radius |
7365 | res.Add(new LSL_Float(shape.LightFalloff)); // falloff | 7362 | res.Add(new LSL_Float(shape.LightFalloff)); // falloff |