aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorMelanie2010-05-10 03:57:17 +0100
committerMelanie2010-05-10 03:57:17 +0100
commit89c762209c9d8fb4cf74c0e89f33caf0f4962f44 (patch)
tree097e707380673f1b68a1d232f82662ca617b8604 /OpenSim/Region
parentAdd Delete handler to SQLite (NG) (diff)
downloadopensim-SC_OLD-89c762209c9d8fb4cf74c0e89f33caf0f4962f44.zip
opensim-SC_OLD-89c762209c9d8fb4cf74c0e89f33caf0f4962f44.tar.gz
opensim-SC_OLD-89c762209c9d8fb4cf74c0e89f33caf0f4962f44.tar.bz2
opensim-SC_OLD-89c762209c9d8fb4cf74c0e89f33caf0f4962f44.tar.xz
Fix a null ref on region crossing
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs5
1 files changed, 4 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 79b6be3..7a9a92d 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -5596,7 +5596,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
5596 public LSL_String llGetLandOwnerAt(LSL_Vector pos) 5596 public LSL_String llGetLandOwnerAt(LSL_Vector pos)
5597 { 5597 {
5598 m_host.AddScriptLPS(1); 5598 m_host.AddScriptLPS(1);
5599 return World.LandChannel.GetLandObject((float)pos.x, (float)pos.y).LandData.OwnerID.ToString(); 5599 ILandObject land = World.LandChannel.GetLandObject((float)pos.x, (float)pos.y);
5600 if (land == null)
5601 return UUID.Zero.ToString();
5602 return land.LandData.OwnerID.ToString();
5600 } 5603 }
5601 5604
5602 /// <summary> 5605 /// <summary>