diff options
author | Melanie | 2013-11-23 19:13:22 +0000 |
---|---|---|
committer | Melanie | 2013-11-23 19:13:22 +0000 |
commit | 3589acdab1721ee7d227a23dbeb2ccf91cbcb996 (patch) | |
tree | a833014a1fedd774e7a9a01cd89a7edddb4210ba /OpenSim/Region/ScriptEngine/Shared/Api | |
parent | Merge branch 'master' into careminster (diff) | |
parent | Revert "Fix issue where sitting on non-root linked prims would send camera to... (diff) | |
download | opensim-SC_OLD-3589acdab1721ee7d227a23dbeb2ccf91cbcb996.zip opensim-SC_OLD-3589acdab1721ee7d227a23dbeb2ccf91cbcb996.tar.gz opensim-SC_OLD-3589acdab1721ee7d227a23dbeb2ccf91cbcb996.tar.bz2 opensim-SC_OLD-3589acdab1721ee7d227a23dbeb2ccf91cbcb996.tar.xz |
Merge branch 'master' into careminster
Conflicts:
.gitignore
OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
prebuild.xml
runprebuild.bat
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 28 | ||||
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs | 4 |
2 files changed, 29 insertions, 3 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index 5cc66b9..74f4f4b 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
@@ -6766,6 +6766,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
6766 | ps.BurstRate = 0.1f; | 6766 | ps.BurstRate = 0.1f; |
6767 | ps.PartMaxAge = 10.0f; | 6767 | ps.PartMaxAge = 10.0f; |
6768 | ps.BurstPartCount = 1; | 6768 | ps.BurstPartCount = 1; |
6769 | ps.BlendFuncSource = ScriptBaseClass.PSYS_PART_BF_SOURCE_ALPHA; | ||
6770 | ps.BlendFuncDest = ScriptBaseClass.PSYS_PART_BF_ONE_MINUS_SOURCE_ALPHA; | ||
6771 | ps.PartStartGlow = 0.0f; | ||
6772 | ps.PartEndGlow = 0.0f; | ||
6773 | |||
6769 | return ps; | 6774 | return ps; |
6770 | } | 6775 | } |
6771 | 6776 | ||
@@ -6800,6 +6805,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
6800 | LSL_Vector tempv = new LSL_Vector(); | 6805 | LSL_Vector tempv = new LSL_Vector(); |
6801 | 6806 | ||
6802 | float tempf = 0; | 6807 | float tempf = 0; |
6808 | int tmpi = 0; | ||
6803 | 6809 | ||
6804 | for (int i = 0; i < rules.Length; i += 2) | 6810 | for (int i = 0; i < rules.Length; i += 2) |
6805 | { | 6811 | { |
@@ -6858,7 +6864,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
6858 | break; | 6864 | break; |
6859 | 6865 | ||
6860 | case (int)ScriptBaseClass.PSYS_SRC_PATTERN: | 6866 | case (int)ScriptBaseClass.PSYS_SRC_PATTERN: |
6861 | int tmpi = (int)rules.GetLSLIntegerItem(i + 1); | 6867 | tmpi = (int)rules.GetLSLIntegerItem(i + 1); |
6862 | prules.Pattern = (Primitive.ParticleSystem.SourcePattern)tmpi; | 6868 | prules.Pattern = (Primitive.ParticleSystem.SourcePattern)tmpi; |
6863 | break; | 6869 | break; |
6864 | 6870 | ||
@@ -6878,6 +6884,26 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
6878 | prules.PartFlags &= 0xFFFFFFFD; // Make sure new angle format is off. | 6884 | prules.PartFlags &= 0xFFFFFFFD; // Make sure new angle format is off. |
6879 | break; | 6885 | break; |
6880 | 6886 | ||
6887 | case (int)ScriptBaseClass.PSYS_PART_BLEND_FUNC_SOURCE: | ||
6888 | tmpi = (int)rules.GetLSLIntegerItem(i + 1); | ||
6889 | prules.BlendFuncSource = (byte)tmpi; | ||
6890 | break; | ||
6891 | |||
6892 | case (int)ScriptBaseClass.PSYS_PART_BLEND_FUNC_DEST: | ||
6893 | tmpi = (int)rules.GetLSLIntegerItem(i + 1); | ||
6894 | prules.BlendFuncDest = (byte)tmpi; | ||
6895 | break; | ||
6896 | |||
6897 | case (int)ScriptBaseClass.PSYS_PART_START_GLOW: | ||
6898 | tempf = (float)rules.GetLSLFloatItem(i + 1); | ||
6899 | prules.PartStartGlow = (float)tempf; | ||
6900 | break; | ||
6901 | |||
6902 | case (int)ScriptBaseClass.PSYS_PART_END_GLOW: | ||
6903 | tempf = (float)rules.GetLSLFloatItem(i + 1); | ||
6904 | prules.PartEndGlow = (float)tempf; | ||
6905 | break; | ||
6906 | |||
6881 | case (int)ScriptBaseClass.PSYS_SRC_TEXTURE: | 6907 | case (int)ScriptBaseClass.PSYS_SRC_TEXTURE: |
6882 | prules.Texture = ScriptUtils.GetAssetIdFromKeyOrItemName(m_host, rules.GetLSLStringItem(i + 1)); | 6908 | prules.Texture = ScriptUtils.GetAssetIdFromKeyOrItemName(m_host, rules.GetLSLStringItem(i + 1)); |
6883 | break; | 6909 | break; |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs index 44a7c14..181399d 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs | |||
@@ -368,7 +368,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins | |||
368 | 368 | ||
369 | Vector3 ZeroVector = new Vector3(0, 0, 0); | 369 | Vector3 ZeroVector = new Vector3(0, 0, 0); |
370 | 370 | ||
371 | bool nameSearch = (ts.name != null && ts.name != ""); | 371 | bool nameSearch = !string.IsNullOrEmpty(ts.name); |
372 | 372 | ||
373 | foreach (EntityBase ent in Entities) | 373 | foreach (EntityBase ent in Entities) |
374 | { | 374 | { |
@@ -608,7 +608,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins | |||
608 | return sensedEntities; | 608 | return sensedEntities; |
609 | senseEntity(sp); | 609 | senseEntity(sp); |
610 | } | 610 | } |
611 | else if (ts.name != null && ts.name != "") | 611 | else if (!string.IsNullOrEmpty(ts.name)) |
612 | { | 612 | { |
613 | ScenePresence sp; | 613 | ScenePresence sp; |
614 | // Try lookup by name will return if/when found | 614 | // Try lookup by name will return if/when found |