aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Interfaces
diff options
context:
space:
mode:
authorDiva Canto2012-03-13 20:16:19 -0700
committerDiva Canto2012-03-13 20:16:19 -0700
commitd6dd3c42d1ad91b4fca409abdc1d817f4a1468af (patch)
treea97c2cb780e8a2e8ff7c0f1421d22e02f207ffa9 /OpenSim/Region/ScriptEngine/Interfaces
parentTeleports: bounce off repeated requests of teleporting the same agent. Some s... (diff)
parentrefactor: rename ScriptInstance.m_CurrentResult to m_CurrentWorkItem to make ... (diff)
downloadopensim-SC-d6dd3c42d1ad91b4fca409abdc1d817f4a1468af.zip
opensim-SC-d6dd3c42d1ad91b4fca409abdc1d817f4a1468af.tar.gz
opensim-SC-d6dd3c42d1ad91b4fca409abdc1d817f4a1468af.tar.bz2
opensim-SC-d6dd3c42d1ad91b4fca409abdc1d817f4a1468af.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Interfaces')
-rw-r--r--OpenSim/Region/ScriptEngine/Interfaces/IScriptInstance.cs8
1 files changed, 6 insertions, 2 deletions
diff --git a/OpenSim/Region/ScriptEngine/Interfaces/IScriptInstance.cs b/OpenSim/Region/ScriptEngine/Interfaces/IScriptInstance.cs
index d3200d5..f00e41f 100644
--- a/OpenSim/Region/ScriptEngine/Interfaces/IScriptInstance.cs
+++ b/OpenSim/Region/ScriptEngine/Interfaces/IScriptInstance.cs
@@ -89,7 +89,7 @@ namespace OpenSim.Region.ScriptEngine.Interfaces
89 void Start(); 89 void Start();
90 90
91 /// <summary> 91 /// <summary>
92 /// Stop the script. 92 /// Stop the script instance.
93 /// </summary> 93 /// </summary>
94 /// <param name="timeout"></param> 94 /// <param name="timeout"></param>
95 /// <returns>true if the script was successfully stopped, false otherwise</returns> 95 /// <returns>true if the script was successfully stopped, false otherwise</returns>
@@ -97,13 +97,17 @@ namespace OpenSim.Region.ScriptEngine.Interfaces
97 97
98 void SetState(string state); 98 void SetState(string state);
99 99
100 /// <summary>
101 /// Post an event to this script instance.
102 /// </summary>
103 /// <param name="data"></param>
100 void PostEvent(EventParams data); 104 void PostEvent(EventParams data);
101 105
102 void Suspend(); 106 void Suspend();
103 void Resume(); 107 void Resume();
104 108
105 /// <summary> 109 /// <summary>
106 /// Process the next event queued for this script 110 /// Process the next event queued for this script instance.
107 /// </summary> 111 /// </summary>
108 /// <returns></returns> 112 /// <returns></returns>
109 object EventProcessor(); 113 object EventProcessor();