Merge branch 'master' of ssh://dahlia@myConnection01/var/git/opensim

author: dahlia 2009-11-30 01:09:46 -0800
committer: dahlia 2009-11-30 01:09:46 -0800
commit: 5b0bb1eff97065a5e02d8fed757bb71f9262595f (patch)
tree: 75901727de505d71cb799a96dfaa27fa43031c29 /OpenSim/Region/Framework/Interfaces/IScriptModule.cs
parent: add agent position to output of "show users" console command (diff)
parent: * Patch from Misterblue to fix Environment.TickCount for statistics purposes.... (diff)
download: opensim-SC-5b0bb1eff97065a5e02d8fed757bb71f9262595f.zip
opensim-SC-5b0bb1eff97065a5e02d8fed757bb71f9262595f.tar.gz
opensim-SC-5b0bb1eff97065a5e02d8fed757bb71f9262595f.tar.bz2
opensim-SC-5b0bb1eff97065a5e02d8fed757bb71f9262595f.tar.xz
1 files changed, 1 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Interfaces/IScriptModule.cs b/OpenSim/Region/Framework/Interfaces/IScriptModule.cs
index 10835b9..f11e571 100644
--- a/OpenSim/Region/Framework/Interfaces/IScriptModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IScriptModule.cs
@@ -34,9 +34,8 @@ namespace OpenSim.Region.Framework.Interfaces
    {
        string ScriptEngineName { get; }
-        string GetAssemblyName(UUID itemID);
        string GetXMLState(UUID itemID);
-        bool CanBeDeleted(UUID itemID);
+        void SetXMLState(UUID itemID, string xml);
        bool PostScriptEvent(UUID itemID, string name, Object[] args);
        bool PostObjectEvent(UUID itemID, string name, Object[] args);
author	dahlia	2009-11-30 01:09:46 -0800
committer	dahlia	2009-11-30 01:09:46 -0800
commit	5b0bb1eff97065a5e02d8fed757bb71f9262595f (patch)
tree	75901727de505d71cb799a96dfaa27fa43031c29 /OpenSim/Region/Framework/Interfaces/IScriptModule.cs
parent	add agent position to output of "show users" console command (diff)
parent	* Patch from Misterblue to fix Environment.TickCount for statistics purposes.... (diff)
download	opensim-SC-5b0bb1eff97065a5e02d8fed757bb71f9262595f.zip opensim-SC-5b0bb1eff97065a5e02d8fed757bb71f9262595f.tar.gz opensim-SC-5b0bb1eff97065a5e02d8fed757bb71f9262595f.tar.bz2 opensim-SC-5b0bb1eff97065a5e02d8fed757bb71f9262595f.tar.xz

diff --git a/OpenSim/Region/Framework/Interfaces/IScriptModule.cs b/OpenSim/Region/Framework/Interfaces/IScriptModule.cs index 10835b9..f11e571 100644 --- a/OpenSim/Region/Framework/Interfaces/IScriptModule.cs +++ b/OpenSim/Region/Framework/Interfaces/IScriptModule.cs
@@ -34,9 +34,8 @@ namespace OpenSim.Region.Framework.Interfaces
34	{	34	{
35	string ScriptEngineName { get; }	35	string ScriptEngineName { get; }
36		36
37	string GetAssemblyName(UUID itemID);
38	string GetXMLState(UUID itemID);	37	string GetXMLState(UUID itemID);
39	bool CanBeDeleted(UUID itemID);	38	void SetXMLState(UUID itemID, string xml);
40		39
41	bool PostScriptEvent(UUID itemID, string name, Object[] args);	40	bool PostScriptEvent(UUID itemID, string name, Object[] args);
42	bool PostObjectEvent(UUID itemID, string name, Object[] args);	41	bool PostObjectEvent(UUID itemID, string name, Object[] args);