From 55a4cf33a3ce954fe1e5fff76e044e649ea31ebd Mon Sep 17 00:00:00 2001 From: Dr Scofield Date: Sat, 28 Jun 2008 07:30:49 +0000 Subject: From: Kurt Taylor Patch to fix the passed parms and properly show llTakeCamera and llReleaseCamera as deprecated. Patch for both XEngine and DotNetEngine. --- OpenSim/Region/ScriptEngine/Common/BuiltIn_Commands_BaseClass.cs | 8 ++++---- OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs | 8 ++++---- .../Region/ScriptEngine/Common/LSL_BuiltIn_Commands_Interface.cs | 8 ++++---- OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 8 ++++---- OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs | 8 ++++---- OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs | 8 ++++---- 6 files changed, 24 insertions(+), 24 deletions(-) (limited to 'OpenSim') diff --git a/OpenSim/Region/ScriptEngine/Common/BuiltIn_Commands_BaseClass.cs b/OpenSim/Region/ScriptEngine/Common/BuiltIn_Commands_BaseClass.cs index c273c03..07e3b41 100644 --- a/OpenSim/Region/ScriptEngine/Common/BuiltIn_Commands_BaseClass.cs +++ b/OpenSim/Region/ScriptEngine/Common/BuiltIn_Commands_BaseClass.cs @@ -760,14 +760,14 @@ namespace OpenSim.Region.ScriptEngine.Common m_LSL_Functions.llDetachFromAvatar(); } - public void llTakeCamera() + public void llTakeCamera(string avatar) { - m_LSL_Functions.llTakeCamera(); + m_LSL_Functions.llTakeCamera(avatar); } - public void llReleaseCamera() + public void llReleaseCamera(string avatar) { - m_LSL_Functions.llReleaseCamera(); + m_LSL_Functions.llReleaseCamera(avatar); } public string llGetOwner() diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs index 6324f1a..6f4943d 100644 --- a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs +++ b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs @@ -2119,16 +2119,16 @@ namespace OpenSim.Region.ScriptEngine.Common NotImplemented("llDetachFromAvatar"); } - public void llTakeCamera() + public void llTakeCamera(string avatar) { m_host.AddScriptLPS(1); - NotImplemented("llTakeCamera"); + Deprecated("llTakeCamera"); } - public void llReleaseCamera() + public void llReleaseCamera(string avatar) { m_host.AddScriptLPS(1); - NotImplemented("llReleaseCamera"); + Deprecated("llReleaseCamera"); } public string llGetOwner() diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands_Interface.cs b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands_Interface.cs index c6464f3..3acbf97 100644 --- a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands_Interface.cs +++ b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands_Interface.cs @@ -211,10 +211,10 @@ namespace OpenSim.Region.ScriptEngine.Common void llAttachToAvatar(int attachment); //wiki: llDetachFromAvatar() void llDetachFromAvatar(); - //wiki: (deprecated) llTakeCamera() - void llTakeCamera(); - //wiki: (deprecated) llReleaseCamera() - void llReleaseCamera(); + //wiki: (deprecated) llTakeCamera(key avatar) + void llTakeCamera(string avatar); + //wiki: (deprecated) llReleaseCamera(key avatar) + void llReleaseCamera(string avatar); //wiki: key llGetOwner() string llGetOwner(); //wiki: llInstantMessage(key user, string message) diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index 70a88fb..afdd898 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs @@ -1975,16 +1975,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api NotImplemented("llDetachFromAvatar"); } - public void llTakeCamera() + public void llTakeCamera(string avatar) { m_host.AddScriptLPS(1); - NotImplemented("llTakeCamera"); + Deprecated("llTakeCamera"); } - public void llReleaseCamera() + public void llReleaseCamera(string avatar) { m_host.AddScriptLPS(1); - NotImplemented("llReleaseCamera"); + Deprecated("llReleaseCamera"); } public string llGetOwner() diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs index 75672a1..8eea756 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs @@ -209,10 +209,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces void llAttachToAvatar(int attachment); //wiki: llDetachFromAvatar() void llDetachFromAvatar(); - //wiki: (deprecated) llTakeCamera() - void llTakeCamera(); - //wiki: (deprecated) llReleaseCamera() - void llReleaseCamera(); + //wiki: (deprecated) llTakeCamera(key avatar) + void llTakeCamera(string avatar); + //wiki: (deprecated) llReleaseCamera(key avatar) + void llReleaseCamera(string avatar); //wiki: key llGetOwner() string llGetOwner(); //wiki: llInstantMessage(key user, string message) diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs index 08ee203..e6966fc 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs @@ -640,14 +640,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase m_LSL_Functions.llDetachFromAvatar(); } - public void llTakeCamera() + public void llTakeCamera(string avatar) { - m_LSL_Functions.llTakeCamera(); + m_LSL_Functions.llTakeCamera(avatar); } - public void llReleaseCamera() + public void llReleaseCamera(string avatar) { - m_LSL_Functions.llReleaseCamera(); + m_LSL_Functions.llReleaseCamera(avatar); } public string llGetOwner() -- cgit v1.1