diff options
author | Charles Krinke | 2008-06-28 16:08:12 +0000 |
---|---|---|
committer | Charles Krinke | 2008-06-28 16:08:12 +0000 |
commit | 9a0ef22ed979433f4d017a252173f38fe5e56892 (patch) | |
tree | 98bd25e3a49a38922b37728df4de9e0fa5b7366a /OpenSim/Region/ScriptEngine/Common | |
parent | plumbing for multiple inventory servers. Mostly done on the region server side. (diff) | |
download | opensim-SC_OLD-9a0ef22ed979433f4d017a252173f38fe5e56892.zip opensim-SC_OLD-9a0ef22ed979433f4d017a252173f38fe5e56892.tar.gz opensim-SC_OLD-9a0ef22ed979433f4d017a252173f38fe5e56892.tar.bz2 opensim-SC_OLD-9a0ef22ed979433f4d017a252173f38fe5e56892.tar.xz |
Mantis#1616. Applied Melanie's patch. This may or may
not break trunk.
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Common')
3 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs index 6f4943d..c240573 100644 --- a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs +++ b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs | |||
@@ -2344,8 +2344,8 @@ namespace OpenSim.Region.ScriptEngine.Common | |||
2344 | public LSL_Types.LSLInteger llGetStartParameter() | 2344 | public LSL_Types.LSLInteger llGetStartParameter() |
2345 | { | 2345 | { |
2346 | m_host.AddScriptLPS(1); | 2346 | m_host.AddScriptLPS(1); |
2347 | // NotImplemented("llGetStartParameter"); | 2347 | NotImplemented("llGetStartParameter"); |
2348 | return m_host.ParentGroup.StartParameter; | 2348 | return 0; |
2349 | } | 2349 | } |
2350 | 2350 | ||
2351 | public void llGodLikeRezObject(string inventory, LSL_Types.Vector3 pos) | 2351 | public void llGodLikeRezObject(string inventory, LSL_Types.Vector3 pos) |
diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventManager.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventManager.cs index 5a3ebc7..93b68d4 100644 --- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventManager.cs +++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventManager.cs | |||
@@ -186,7 +186,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase | |||
186 | myScriptEngine.m_EventQueueManager.AddToObjectQueue(localID, "touch_end", detstruct, new object[] { new LSL_Types.LSLInteger(1) }); | 186 | myScriptEngine.m_EventQueueManager.AddToObjectQueue(localID, "touch_end", detstruct, new object[] { new LSL_Types.LSLInteger(1) }); |
187 | } | 187 | } |
188 | 188 | ||
189 | public void OnRezScript(uint localID, LLUUID itemID, string script) | 189 | public void OnRezScript(uint localID, LLUUID itemID, string script, int startParam, bool postOnRez) |
190 | { | 190 | { |
191 | Console.WriteLine("OnRezScript localID: " + localID + " LLUID: " + itemID.ToString() + " Size: " + | 191 | Console.WriteLine("OnRezScript localID: " + localID + " LLUID: " + itemID.ToString() + " Size: " + |
192 | script.Length); | 192 | script.Length); |
diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptServerInterfaces.cs b/OpenSim/Region/ScriptEngine/Common/ScriptServerInterfaces.cs index 59f828d..f04ac01 100644 --- a/OpenSim/Region/ScriptEngine/Common/ScriptServerInterfaces.cs +++ b/OpenSim/Region/ScriptEngine/Common/ScriptServerInterfaces.cs | |||
@@ -39,7 +39,7 @@ namespace OpenSim.Region.ScriptEngine.Common | |||
39 | public interface RemoteEvents | 39 | public interface RemoteEvents |
40 | { | 40 | { |
41 | void touch_start(uint localID, LLVector3 offsetPos, IClientAPI remoteClient); | 41 | void touch_start(uint localID, LLVector3 offsetPos, IClientAPI remoteClient); |
42 | void OnRezScript(uint localID, LLUUID itemID, string script); | 42 | void OnRezScript(uint localID, LLUUID itemID, string script, int startParam, bool postOnRez); |
43 | void OnRemoveScript(uint localID, LLUUID itemID); | 43 | void OnRemoveScript(uint localID, LLUUID itemID); |
44 | void state_exit(uint localID); | 44 | void state_exit(uint localID); |
45 | void touch(uint localID, LLUUID itemID); | 45 | void touch(uint localID, LLUUID itemID); |