aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-03-18 11:32:44 +0000
committerJustin Clarke Casey2008-03-18 11:32:44 +0000
commitf81c491725cbb9730ed017c1e4c96b204ae35473 (patch)
tree9e7a2c2275db5b878f0280a446228ec163a71c16 /OpenSim
parentSince we don't yet have a reliable way to release the lock that prevents a us... (diff)
downloadopensim-SC_OLD-f81c491725cbb9730ed017c1e4c96b204ae35473.zip
opensim-SC_OLD-f81c491725cbb9730ed017c1e4c96b204ae35473.tar.gz
opensim-SC_OLD-f81c491725cbb9730ed017c1e4c96b204ae35473.tar.bz2
opensim-SC_OLD-f81c491725cbb9730ed017c1e4c96b204ae35473.tar.xz
Patch from DrSchofld (IBM). In his own words
structs (such as LLUUID) are considered values by mono. comparing them against null makes no sense and the mono compiler will flag that as evaluating to always false --- except if "cleverly" disguised. the attached patch fixes such an occurrence in OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins/SensorRepeat.cs. [yes, i'm on a crusade against comparing structs against null, go ask jradford from libsl ;-)]
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins/SensorRepeat.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins/SensorRepeat.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins/SensorRepeat.cs
index f6614b0..8fea3a3 100644
--- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins/SensorRepeat.cs
+++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins/SensorRepeat.cs
@@ -257,12 +257,12 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase.AsyncCommandPlugin
257 if (ang_obj > ts.arc) keep = false; 257 if (ang_obj > ts.arc) keep = false;
258 } 258 }
259 259
260 if (keep && (!ts.keyID.Equals(null)) && (ts.keyID != LLUUID.Zero) && (ts.keyID != ent.UUID)) 260 if (keep && (ts.keyID != LLUUID.Zero) && (ts.keyID != ent.UUID))
261 { 261 {
262 keep = false; 262 keep = false;
263 } 263 }
264 264
265 if (keep&& (ts.name.Length > 0)) 265 if (keep && (ts.name.Length > 0))
266 { 266 {
267 string avatarname=null; 267 string avatarname=null;
268 string objectname=null; 268 string objectname=null;