diff options
author | Tedd Hansen | 2007-08-13 20:55:07 +0000 |
---|---|---|
committer | Tedd Hansen | 2007-08-13 20:55:07 +0000 |
commit | 79dc1a4f7d4196d14bd51cb0839b9dd8c644cab7 (patch) | |
tree | e07b695666f9fe6e90a674706ebdc9509dd33065 /OpenSim/Region/Environment/Scenes | |
parent | committed a test version of OpenSimAssetSet.xml in last commit, so fixing that. (diff) | |
download | opensim-SC-79dc1a4f7d4196d14bd51cb0839b9dd8c644cab7.zip opensim-SC-79dc1a4f7d4196d14bd51cb0839b9dd8c644cab7.tar.gz opensim-SC-79dc1a4f7d4196d14bd51cb0839b9dd8c644cab7.tar.bz2 opensim-SC-79dc1a4f7d4196d14bd51cb0839b9dd8c644cab7.tar.xz |
Common script for all objects (Default.lsl). ScriptEngine touch_start event now works, but llSay only outputs to server console.
Diffstat (limited to 'OpenSim/Region/Environment/Scenes')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.cs | 3 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Scripting/ScriptEngineInterface.cs | 1 |
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs index 4aa3c49..b423e0a 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.cs | |||
@@ -1020,8 +1020,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
1020 | public void AddScriptEngine(OpenSim.Region.Environment.Scenes.Scripting.ScriptEngineInterface ScriptEngine) | 1020 | public void AddScriptEngine(OpenSim.Region.Environment.Scenes.Scripting.ScriptEngineInterface ScriptEngine) |
1021 | { | 1021 | { |
1022 | ScriptEngines.Add(ScriptEngine); | 1022 | ScriptEngines.Add(ScriptEngine); |
1023 | ScriptEngine.InitializeEngine(this); | 1023 | ScriptEngine.InitializeEngine(this); } |
1024 | } | ||
1025 | #endregion | 1024 | #endregion |
1026 | 1025 | ||
1027 | public LLUUID ConvertLocalIDToFullID(uint localID) | 1026 | public LLUUID ConvertLocalIDToFullID(uint localID) |
diff --git a/OpenSim/Region/Environment/Scenes/Scripting/ScriptEngineInterface.cs b/OpenSim/Region/Environment/Scenes/Scripting/ScriptEngineInterface.cs index 3c3b5a7..5f378a6 100644 --- a/OpenSim/Region/Environment/Scenes/Scripting/ScriptEngineInterface.cs +++ b/OpenSim/Region/Environment/Scenes/Scripting/ScriptEngineInterface.cs | |||
@@ -36,5 +36,6 @@ namespace OpenSim.Region.Environment.Scenes.Scripting | |||
36 | { | 36 | { |
37 | void InitializeEngine(OpenSim.Region.Environment.Scenes.Scene Sceneworld); | 37 | void InitializeEngine(OpenSim.Region.Environment.Scenes.Scene Sceneworld); |
38 | void Shutdown(); | 38 | void Shutdown(); |
39 | void StartScript(string ScriptID, string ObjectID); | ||
39 | } | 40 | } |
40 | } | 41 | } |