diff options
author | Jeff Ames | 2008-03-19 09:36:13 +0000 |
---|---|---|
committer | Jeff Ames | 2008-03-19 09:36:13 +0000 |
commit | a0e1be3280e4be49cf0ca8d211b97ef8c1ddee2f (patch) | |
tree | be64babdd6f1bcb2a946d637b81739445facdd31 /OpenSim/Region/ScriptEngine | |
parent | * Add a large amount of extra locking to m_parts in SceneObjectGroup (diff) | |
download | opensim-SC_OLD-a0e1be3280e4be49cf0ca8d211b97ef8c1ddee2f.zip opensim-SC_OLD-a0e1be3280e4be49cf0ca8d211b97ef8c1ddee2f.tar.gz opensim-SC_OLD-a0e1be3280e4be49cf0ca8d211b97ef8c1ddee2f.tar.bz2 opensim-SC_OLD-a0e1be3280e4be49cf0ca8d211b97ef8c1ddee2f.tar.xz |
Fixed some comparisons of LLUUIDs to null.
Thanks to DrSchofld for pointing this out.
Diffstat (limited to 'OpenSim/Region/ScriptEngine')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs index 9eadbb4..85cf0b7 100644 --- a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs +++ b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs | |||
@@ -3339,7 +3339,7 @@ namespace OpenSim.Region.ScriptEngine.Common | |||
3339 | { | 3339 | { |
3340 | m_host.AddScriptLPS(1); | 3340 | m_host.AddScriptLPS(1); |
3341 | LLUUID landowner = World.GetLandOwner(m_host.AbsolutePosition.X, m_host.AbsolutePosition.Y); | 3341 | LLUUID landowner = World.GetLandOwner(m_host.AbsolutePosition.X, m_host.AbsolutePosition.Y); |
3342 | if (landowner.Equals(null)) | 3342 | if (landowner == LLUUID.Zero) |
3343 | { | 3343 | { |
3344 | return; | 3344 | return; |
3345 | } | 3345 | } |
@@ -3355,7 +3355,7 @@ namespace OpenSim.Region.ScriptEngine.Common | |||
3355 | m_host.AddScriptLPS(1); | 3355 | m_host.AddScriptLPS(1); |
3356 | LLUUID landowner = World.GetLandOwner(m_host.AbsolutePosition.X, m_host.AbsolutePosition.Y); | 3356 | LLUUID landowner = World.GetLandOwner(m_host.AbsolutePosition.X, m_host.AbsolutePosition.Y); |
3357 | 3357 | ||
3358 | if(landowner.Equals(null)) | 3358 | if(landowner == LLUUID.Zero) |
3359 | { | 3359 | { |
3360 | return; | 3360 | return; |
3361 | } | 3361 | } |
@@ -4306,7 +4306,7 @@ namespace OpenSim.Region.ScriptEngine.Common | |||
4306 | LLUUID reqID = httpScriptMod. | 4306 | LLUUID reqID = httpScriptMod. |
4307 | StartHttpRequest(m_localID, m_itemID, url, param, body); | 4307 | StartHttpRequest(m_localID, m_itemID, url, param, body); |
4308 | 4308 | ||
4309 | if (!reqID.Equals(null)) | 4309 | if (reqID != LLUUID.Zero) |
4310 | return reqID.ToString(); | 4310 | return reqID.ToString(); |
4311 | else | 4311 | else |
4312 | return null; | 4312 | return null; |