diff options
author | Teravus Ovares | 2008-04-20 04:19:44 +0000 |
---|---|---|
committer | Teravus Ovares | 2008-04-20 04:19:44 +0000 |
commit | 3358d70c5b174b2b9ac1216e9e43497279982805 (patch) | |
tree | 3b6684a1d58912962eeda8a6b5fd1fc69ae2d00d /OpenSim/Region/ScriptEngine/Common | |
parent | * Added experimental "svn load <revision>" command to allow you to load a reg... (diff) | |
download | opensim-SC_OLD-3358d70c5b174b2b9ac1216e9e43497279982805.zip opensim-SC_OLD-3358d70c5b174b2b9ac1216e9e43497279982805.tar.gz opensim-SC_OLD-3358d70c5b174b2b9ac1216e9e43497279982805.tar.bz2 opensim-SC_OLD-3358d70c5b174b2b9ac1216e9e43497279982805.tar.xz |
* Updates LSL2CS converter
* All objects are not touchable by default now
* When a script listens for one of the touch events in the state, an object becomes touchable.
* All LSL scripts report which events they consume now
** This uses semi-complicated Regex to discover the events, stick them in a dictionary, and then write a method call into each script state's state_entry() event.
** Tedd may figure out a better way to do this in the future. For now, this works for LSL.
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Common')
3 files changed, 10 insertions, 0 deletions
diff --git a/OpenSim/Region/ScriptEngine/Common/BuiltIn_Commands_BaseClass.cs b/OpenSim/Region/ScriptEngine/Common/BuiltIn_Commands_BaseClass.cs index cb4ca39..b6468c2 100644 --- a/OpenSim/Region/ScriptEngine/Common/BuiltIn_Commands_BaseClass.cs +++ b/OpenSim/Region/ScriptEngine/Common/BuiltIn_Commands_BaseClass.cs | |||
@@ -1990,6 +1990,10 @@ namespace OpenSim.Region.ScriptEngine.Common | |||
1990 | return m_LSL_Functions.osDrawImage(drawList, width, height, imageUrl); | 1990 | return m_LSL_Functions.osDrawImage(drawList, width, height, imageUrl); |
1991 | } | 1991 | } |
1992 | 1992 | ||
1993 | public void osSetStateEvents(int events) | ||
1994 | { | ||
1995 | m_LSL_Functions.osSetStateEvents(events); | ||
1996 | } | ||
1993 | 1997 | ||
1994 | // | 1998 | // |
1995 | 1999 | ||
diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs index 26e56c7..4192d40 100644 --- a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs +++ b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs | |||
@@ -5597,6 +5597,11 @@ namespace OpenSim.Region.ScriptEngine.Common | |||
5597 | return drawList; | 5597 | return drawList; |
5598 | } | 5598 | } |
5599 | 5599 | ||
5600 | public void osSetStateEvents(int events) | ||
5601 | { | ||
5602 | m_host.setScriptEvents(m_itemID,events); | ||
5603 | } | ||
5604 | |||
5600 | private void NotImplemented(string command) | 5605 | private void NotImplemented(string command) |
5601 | { | 5606 | { |
5602 | if (throwErrorOnNotImplemented) | 5607 | if (throwErrorOnNotImplemented) |
diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands_Interface.cs b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands_Interface.cs index 4e632ef..205e908 100644 --- a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands_Interface.cs +++ b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands_Interface.cs | |||
@@ -669,5 +669,6 @@ namespace OpenSim.Region.ScriptEngine.Common | |||
669 | string osSetPenSize(string drawList, int penSize); | 669 | string osSetPenSize(string drawList, int penSize); |
670 | string osSetPenColour(string drawList, string colour); | 670 | string osSetPenColour(string drawList, string colour); |
671 | string osDrawImage(string drawList, int width, int height, string imageUrl); | 671 | string osDrawImage(string drawList, int width, int height, string imageUrl); |
672 | void osSetStateEvents(int events); | ||
672 | } | 673 | } |
673 | } | 674 | } |