diff options
author | Dr Scofield | 2008-06-28 07:30:49 +0000 |
---|---|---|
committer | Dr Scofield | 2008-06-28 07:30:49 +0000 |
commit | 55a4cf33a3ce954fe1e5fff76e044e649ea31ebd (patch) | |
tree | dfb9a2a3d72e194384c90873863c8158b4a897fe /OpenSim/Region/ScriptEngine/Shared | |
parent | * Melanie adds the event manager back to the XEngine so all yr events are her... (diff) | |
download | opensim-SC_OLD-55a4cf33a3ce954fe1e5fff76e044e649ea31ebd.zip opensim-SC_OLD-55a4cf33a3ce954fe1e5fff76e044e649ea31ebd.tar.gz opensim-SC_OLD-55a4cf33a3ce954fe1e5fff76e044e649ea31ebd.tar.bz2 opensim-SC_OLD-55a4cf33a3ce954fe1e5fff76e044e649ea31ebd.tar.xz |
From: Kurt Taylor <krtaylor@us.ibm.com>
Patch to fix the passed parms and properly show llTakeCamera and
llReleaseCamera as deprecated. Patch for both XEngine and DotNetEngine.
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared')
3 files changed, 12 insertions, 12 deletions
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 | |||
1975 | NotImplemented("llDetachFromAvatar"); | 1975 | NotImplemented("llDetachFromAvatar"); |
1976 | } | 1976 | } |
1977 | 1977 | ||
1978 | public void llTakeCamera() | 1978 | public void llTakeCamera(string avatar) |
1979 | { | 1979 | { |
1980 | m_host.AddScriptLPS(1); | 1980 | m_host.AddScriptLPS(1); |
1981 | NotImplemented("llTakeCamera"); | 1981 | Deprecated("llTakeCamera"); |
1982 | } | 1982 | } |
1983 | 1983 | ||
1984 | public void llReleaseCamera() | 1984 | public void llReleaseCamera(string avatar) |
1985 | { | 1985 | { |
1986 | m_host.AddScriptLPS(1); | 1986 | m_host.AddScriptLPS(1); |
1987 | NotImplemented("llReleaseCamera"); | 1987 | Deprecated("llReleaseCamera"); |
1988 | } | 1988 | } |
1989 | 1989 | ||
1990 | public string llGetOwner() | 1990 | 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 | |||
209 | void llAttachToAvatar(int attachment); | 209 | void llAttachToAvatar(int attachment); |
210 | //wiki: llDetachFromAvatar() | 210 | //wiki: llDetachFromAvatar() |
211 | void llDetachFromAvatar(); | 211 | void llDetachFromAvatar(); |
212 | //wiki: (deprecated) llTakeCamera() | 212 | //wiki: (deprecated) llTakeCamera(key avatar) |
213 | void llTakeCamera(); | 213 | void llTakeCamera(string avatar); |
214 | //wiki: (deprecated) llReleaseCamera() | 214 | //wiki: (deprecated) llReleaseCamera(key avatar) |
215 | void llReleaseCamera(); | 215 | void llReleaseCamera(string avatar); |
216 | //wiki: key llGetOwner() | 216 | //wiki: key llGetOwner() |
217 | string llGetOwner(); | 217 | string llGetOwner(); |
218 | //wiki: llInstantMessage(key user, string message) | 218 | //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 | |||
640 | m_LSL_Functions.llDetachFromAvatar(); | 640 | m_LSL_Functions.llDetachFromAvatar(); |
641 | } | 641 | } |
642 | 642 | ||
643 | public void llTakeCamera() | 643 | public void llTakeCamera(string avatar) |
644 | { | 644 | { |
645 | m_LSL_Functions.llTakeCamera(); | 645 | m_LSL_Functions.llTakeCamera(avatar); |
646 | } | 646 | } |
647 | 647 | ||
648 | public void llReleaseCamera() | 648 | public void llReleaseCamera(string avatar) |
649 | { | 649 | { |
650 | m_LSL_Functions.llReleaseCamera(); | 650 | m_LSL_Functions.llReleaseCamera(avatar); |
651 | } | 651 | } |
652 | 652 | ||
653 | public string llGetOwner() | 653 | public string llGetOwner() |