diff options
| author | UbitUmarov | 2016-11-16 13:07:23 +0000 |
|---|---|---|
| committer | UbitUmarov | 2016-11-16 13:07:23 +0000 |
| commit | ec8393571f88ab54a47ffcb91d0f82a815a682ad (patch) | |
| tree | 362b08a13538a55ef2bff7a3e4290341ce9f159c /OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LS_Api.cs | |
| parent | Merge branch 'master' into httptests (diff) | |
| parent | fix parsing of a vector4 and storing on a lsl quaternion needed for lightSha... (diff) | |
| download | opensim-SC-ec8393571f88ab54a47ffcb91d0f82a815a682ad.zip opensim-SC-ec8393571f88ab54a47ffcb91d0f82a815a682ad.tar.gz opensim-SC-ec8393571f88ab54a47ffcb91d0f82a815a682ad.tar.bz2 opensim-SC-ec8393571f88ab54a47ffcb91d0f82a815a682ad.tar.xz | |
Merge branch 'master' into httptests
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LS_Api.cs')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LS_Api.cs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LS_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LS_Api.cs index e5e43f8..8cd065b 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LS_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LS_Api.cs | |||
| @@ -295,7 +295,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 295 | idx++; | 295 | idx++; |
| 296 | try | 296 | try |
| 297 | { | 297 | { |
| 298 | iQ = rules.GetQuaternionItem(idx); | 298 | iQ = rules.GetVector4Item(idx); |
| 299 | } | 299 | } |
| 300 | catch (InvalidCastException) | 300 | catch (InvalidCastException) |
| 301 | { | 301 | { |
| @@ -319,7 +319,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 319 | idx++; | 319 | idx++; |
| 320 | try | 320 | try |
| 321 | { | 321 | { |
| 322 | iQ = rules.GetQuaternionItem(idx); | 322 | iQ = rules.GetVector4Item(idx); |
| 323 | } | 323 | } |
| 324 | catch (InvalidCastException) | 324 | catch (InvalidCastException) |
| 325 | { | 325 | { |
| @@ -342,7 +342,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 342 | idx++; | 342 | idx++; |
| 343 | try | 343 | try |
| 344 | { | 344 | { |
| 345 | iQ = rules.GetQuaternionItem(idx); | 345 | iQ = rules.GetVector4Item(idx); |
| 346 | } | 346 | } |
| 347 | catch (InvalidCastException) | 347 | catch (InvalidCastException) |
| 348 | { | 348 | { |
| @@ -532,7 +532,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 532 | idx++; | 532 | idx++; |
| 533 | try | 533 | try |
| 534 | { | 534 | { |
| 535 | iQ = rules.GetQuaternionItem(idx); | 535 | iQ = rules.GetVector4Item(idx); |
| 536 | } | 536 | } |
| 537 | catch (InvalidCastException) | 537 | catch (InvalidCastException) |
| 538 | { | 538 | { |
| @@ -654,7 +654,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 654 | break; | 654 | break; |
| 655 | case (int)ScriptBaseClass.WL_SUN_MOON_COLOR: | 655 | case (int)ScriptBaseClass.WL_SUN_MOON_COLOR: |
| 656 | idx++; | 656 | idx++; |
| 657 | iQ = rules.GetQuaternionItem(idx); | 657 | iQ = rules.GetVector4Item(idx); |
| 658 | try | 658 | try |
| 659 | { | 659 | { |
| 660 | wl.sunMoonColor = new Vector4((float)iQ.x, (float)iQ.y, (float)iQ.z, (float)iQ.s); | 660 | wl.sunMoonColor = new Vector4((float)iQ.x, (float)iQ.y, (float)iQ.z, (float)iQ.s); |