diff options
author | idb | 2008-12-09 00:51:35 +0000 |
---|---|---|
committer | idb | 2008-12-09 00:51:35 +0000 |
commit | 8c33fcb321158a22cfac97d3e71c65225c9753f2 (patch) | |
tree | ee6c8a4090c911d70d910dcb0b7dc4eeae450b32 | |
parent | Reinstate setting timeout to never, the default 30 second timeout was causing... (diff) | |
download | opensim-SC-8c33fcb321158a22cfac97d3e71c65225c9753f2.zip opensim-SC-8c33fcb321158a22cfac97d3e71c65225c9753f2.tar.gz opensim-SC-8c33fcb321158a22cfac97d3e71c65225c9753f2.tar.bz2 opensim-SC-8c33fcb321158a22cfac97d3e71c65225c9753f2.tar.xz |
Remove null checks on structs
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index f98a9bb..a9feb4b 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
@@ -896,7 +896,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
896 | { | 896 | { |
897 | m_host.AddScriptLPS(1); | 897 | m_host.AddScriptLPS(1); |
898 | DetectParams detectedParams = m_ScriptEngine.GetDetectParams(m_itemID, index); | 898 | DetectParams detectedParams = m_ScriptEngine.GetDetectParams(m_itemID, index); |
899 | if (detectedParams == null || detectedParams.TouchBinormal == null) | 899 | if (detectedParams == null) |
900 | return new LSL_Vector(); | 900 | return new LSL_Vector(); |
901 | return detectedParams.TouchBinormal; | 901 | return detectedParams.TouchBinormal; |
902 | } | 902 | } |
@@ -908,7 +908,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
908 | { | 908 | { |
909 | m_host.AddScriptLPS(1); | 909 | m_host.AddScriptLPS(1); |
910 | DetectParams detectedParams = m_ScriptEngine.GetDetectParams(m_itemID, index); | 910 | DetectParams detectedParams = m_ScriptEngine.GetDetectParams(m_itemID, index); |
911 | if (detectedParams == null || detectedParams.TouchFace == null) | 911 | if (detectedParams == null) |
912 | return new LSL_Integer(-1); | 912 | return new LSL_Integer(-1); |
913 | return new LSL_Integer(detectedParams.TouchFace); | 913 | return new LSL_Integer(detectedParams.TouchFace); |
914 | } | 914 | } |
@@ -920,7 +920,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
920 | { | 920 | { |
921 | m_host.AddScriptLPS(1); | 921 | m_host.AddScriptLPS(1); |
922 | DetectParams detectedParams = m_ScriptEngine.GetDetectParams(m_itemID, index); | 922 | DetectParams detectedParams = m_ScriptEngine.GetDetectParams(m_itemID, index); |
923 | if (detectedParams == null || detectedParams.TouchNormal == null) | 923 | if (detectedParams == null) |
924 | return new LSL_Vector(); | 924 | return new LSL_Vector(); |
925 | return detectedParams.TouchNormal; | 925 | return detectedParams.TouchNormal; |
926 | } | 926 | } |
@@ -932,7 +932,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
932 | { | 932 | { |
933 | m_host.AddScriptLPS(1); | 933 | m_host.AddScriptLPS(1); |
934 | DetectParams detectedParams = m_ScriptEngine.GetDetectParams(m_itemID, index); | 934 | DetectParams detectedParams = m_ScriptEngine.GetDetectParams(m_itemID, index); |
935 | if (detectedParams == null || detectedParams.TouchPos == null) | 935 | if (detectedParams == null) |
936 | return new LSL_Vector(); | 936 | return new LSL_Vector(); |
937 | return detectedParams.TouchPos; | 937 | return detectedParams.TouchPos; |
938 | } | 938 | } |
@@ -944,7 +944,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
944 | { | 944 | { |
945 | m_host.AddScriptLPS(1); | 945 | m_host.AddScriptLPS(1); |
946 | DetectParams detectedParams = m_ScriptEngine.GetDetectParams(m_itemID, index); | 946 | DetectParams detectedParams = m_ScriptEngine.GetDetectParams(m_itemID, index); |
947 | if (detectedParams == null || detectedParams.TouchST == null) | 947 | if (detectedParams == null) |
948 | return new LSL_Vector(-1.0, -1.0, 0.0); | 948 | return new LSL_Vector(-1.0, -1.0, 0.0); |
949 | return detectedParams.TouchST; | 949 | return detectedParams.TouchST; |
950 | } | 950 | } |
@@ -956,7 +956,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
956 | { | 956 | { |
957 | m_host.AddScriptLPS(1); | 957 | m_host.AddScriptLPS(1); |
958 | DetectParams detectedParams = m_ScriptEngine.GetDetectParams(m_itemID, index); | 958 | DetectParams detectedParams = m_ScriptEngine.GetDetectParams(m_itemID, index); |
959 | if (detectedParams == null || detectedParams.TouchUV == null) | 959 | if (detectedParams == null) |
960 | return new LSL_Vector(-1.0, -1.0, 0.0); | 960 | return new LSL_Vector(-1.0, -1.0, 0.0); |
961 | return detectedParams.TouchUV; | 961 | return detectedParams.TouchUV; |
962 | } | 962 | } |