aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine
diff options
context:
space:
mode:
authorMW2007-08-27 11:18:50 +0000
committerMW2007-08-27 11:18:50 +0000
commit6181191a037fd8481cff640405685d9a46ba89a3 (patch)
tree92d10e0ed07b380d6491ae7b3e21ab199b3ea5cd /OpenSim/Region/ScriptEngine
parentAnother small tweak to image sending. (diff)
downloadopensim-SC-6181191a037fd8481cff640405685d9a46ba89a3.zip
opensim-SC-6181191a037fd8481cff640405685d9a46ba89a3.tar.gz
opensim-SC-6181191a037fd8481cff640405685d9a46ba89a3.tar.bz2
opensim-SC-6181191a037fd8481cff640405685d9a46ba89a3.tar.xz
Stopped EntityBase from implementing IScriptHost, as don't think it should, multiple objects are based on entitybase and they all don't want the baggage from IScriptHost. SceneObjectPart already implements it anyway.
Added llGetOwner function, and tested the ll functions that I added in last commit.
Diffstat (limited to 'OpenSim/Region/ScriptEngine')
-rw-r--r--OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands.cs
index 92024b6..493a063 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands.cs
@@ -293,7 +293,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler
293 public void llDetachFromAvatar() { } 293 public void llDetachFromAvatar() { }
294 public void llTakeCamera() { } 294 public void llTakeCamera() { }
295 public void llReleaseCamera() { } 295 public void llReleaseCamera() { }
296 public string llGetOwner() { return ""; } 296 public string llGetOwner() { return m_host.ObjectOwner.ToStringHyphenated(); }
297 public void llInstantMessage(string user, string message) { } 297 public void llInstantMessage(string user, string message) { }
298 public void llEmail(string address, string subject, string message) { } 298 public void llEmail(string address, string subject, string message) { }
299 public void llGetNextEmail(string address, string subject) { } 299 public void llGetNextEmail(string address, string subject) { }
@@ -587,7 +587,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler
587 public void llLoadURL(string avatar_id, string message, string url) 587 public void llLoadURL(string avatar_id, string message, string url)
588 { 588 {
589 LLUUID avatarId = new LLUUID(avatar_id); 589 LLUUID avatarId = new LLUUID(avatar_id);
590 m_ScriptEngine.World.SendUrlToUser(avatarId, m_host.Name, m_host.UUID, LLUUID.Zero, false, message, url); 590 m_ScriptEngine.World.SendUrlToUser(avatarId, m_host.Name, m_host.UUID, m_host.ObjectOwner, false, message, url);
591 } 591 }
592 public void llParcelMediaCommandList(List<string> commandList) { } 592 public void llParcelMediaCommandList(List<string> commandList) { }
593 public void llParcelMediaQuery() { } 593 public void llParcelMediaQuery() { }