aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Common
diff options
context:
space:
mode:
authoralondria2008-03-29 19:49:07 +0000
committeralondria2008-03-29 19:49:07 +0000
commit0e0445573e2f234bdaa2719fda64999bdbb0d9c1 (patch)
treeabe188dd9c52f227cd6da71470a20a77f8a046e5 /OpenSim/Region/ScriptEngine/Common
parentRe-enabled terrain texture generation for the world map. Adam can clean up/ s... (diff)
downloadopensim-SC_OLD-0e0445573e2f234bdaa2719fda64999bdbb0d9c1.zip
opensim-SC_OLD-0e0445573e2f234bdaa2719fda64999bdbb0d9c1.tar.gz
opensim-SC_OLD-0e0445573e2f234bdaa2719fda64999bdbb0d9c1.tar.bz2
opensim-SC_OLD-0e0445573e2f234bdaa2719fda64999bdbb0d9c1.tar.xz
Patches llAvatarOnSitTarget to return NULL_KEY opposed to a blank string. Should fix Mantis 838
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Common')
-rw-r--r--OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs13
1 files changed, 7 insertions, 6 deletions
diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
index ad4c21a..c02d869 100644
--- a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
+++ b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
@@ -3292,12 +3292,13 @@ namespace OpenSim.Region.ScriptEngine.Common
3292 public string llAvatarOnSitTarget() 3292 public string llAvatarOnSitTarget()
3293 { 3293 {
3294 m_host.AddScriptLPS(1); 3294 m_host.AddScriptLPS(1);
3295 LLUUID AVID = m_host.GetAvatarOnSitTarget(); 3295 return m_host.GetAvatarOnSitTarget().ToString();
3296 3296 //LLUUID AVID = m_host.GetAvatarOnSitTarget();
3297 if (AVID != LLUUID.Zero) 3297
3298 return AVID.ToString(); 3298 //if (AVID != LLUUID.Zero)
3299 else 3299 // return AVID.ToString();
3300 return String.Empty; 3300 //else
3301 // return String.Empty;
3301 } 3302 }
3302 3303
3303 public void llAddToLandPassList(string avatar, double hours) 3304 public void llAddToLandPassList(string avatar, double hours)