aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/DotNetEngine
diff options
context:
space:
mode:
authorTedd Hansen2007-12-30 22:37:07 +0000
committerTedd Hansen2007-12-30 22:37:07 +0000
commit6055db2bc3beadcfd3e06c74b0fffb42ae4545a7 (patch)
treedebac78168e81bc1995c39ffd8134f61613652c1 /OpenSim/Region/ScriptEngine/DotNetEngine
parentAdd an extra check that we don't create new inventory folders for a user that... (diff)
downloadopensim-SC_OLD-6055db2bc3beadcfd3e06c74b0fffb42ae4545a7.zip
opensim-SC_OLD-6055db2bc3beadcfd3e06c74b0fffb42ae4545a7.tar.gz
opensim-SC_OLD-6055db2bc3beadcfd3e06c74b0fffb42ae4545a7.tar.bz2
opensim-SC_OLD-6055db2bc3beadcfd3e06c74b0fffb42ae4545a7.tar.xz
server->script event path almost ready for remote scriptengine (translation table between local script ID and remote script ID missing)
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/ScriptEngine/DotNetEngine/EventManager.cs70
-rw-r--r--OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs17
2 files changed, 41 insertions, 46 deletions
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/EventManager.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/EventManager.cs
index ced5025..16182f9 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/EventManager.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/EventManager.cs
@@ -36,7 +36,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
36 /// Prepares events so they can be directly executed upon a script by EventQueueManager, then queues it. 36 /// Prepares events so they can be directly executed upon a script by EventQueueManager, then queues it.
37 /// </summary> 37 /// </summary>
38 [Serializable] 38 [Serializable]
39 internal class EventManager 39 public class EventManager
40 { 40 {
41 41
42 // 42 //
@@ -46,7 +46,9 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
46 // This class it the link between an event inside OpenSim and the corresponding event in a user script being executed. 46 // This class it the link between an event inside OpenSim and the corresponding event in a user script being executed.
47 // 47 //
48 // For example when an user touches an object then the "myScriptEngine.World.EventManager.OnObjectGrab" event is fired inside OpenSim. 48 // For example when an user touches an object then the "myScriptEngine.World.EventManager.OnObjectGrab" event is fired inside OpenSim.
49 // We hook up to this event and queue a touch_start in EventQueueManager with the proper LSL parameters. It will then be delivered to the script by EventQueueManager. 49 // We hook up to this event and queue a touch_start in EventQueueManager with the proper LSL parameters.
50 // It will then be delivered to the script by EventQueueManager.
51 //
50 // You can check debug C# dump of an LSL script if you need to verify what exact parameters are needed. 52 // You can check debug C# dump of an LSL script if you need to verify what exact parameters are needed.
51 // 53 //
52 54
@@ -105,128 +107,128 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
105 // When queued in EventQueueManager they need to be LSL compatible (name and params) 107 // When queued in EventQueueManager they need to be LSL compatible (name and params)
106 108
107 //public void state_entry() { } // 109 //public void state_entry() { } //
108 public void state_exit() 110 public void state_exit(uint localID, LLUUID itemID)
109 { 111 {
110 } 112 }
111 113
112 //public void touch_start() { } 114 //public void touch_start(uint localID, LLUUID itemID) { }
113 public void touch() 115 public void touch(uint localID, LLUUID itemID)
114 { 116 {
115 } 117 }
116 118
117 public void touch_end() 119 public void touch_end(uint localID, LLUUID itemID)
118 { 120 {
119 } 121 }
120 122
121 public void collision_start() 123 public void collision_start(uint localID, LLUUID itemID)
122 { 124 {
123 } 125 }
124 126
125 public void collision() 127 public void collision(uint localID, LLUUID itemID)
126 { 128 {
127 } 129 }
128 130
129 public void collision_end() 131 public void collision_end(uint localID, LLUUID itemID)
130 { 132 {
131 } 133 }
132 134
133 public void land_collision_start() 135 public void land_collision_start(uint localID, LLUUID itemID)
134 { 136 {
135 } 137 }
136 138
137 public void land_collision() 139 public void land_collision(uint localID, LLUUID itemID)
138 { 140 {
139 } 141 }
140 142
141 public void land_collision_end() 143 public void land_collision_end(uint localID, LLUUID itemID)
142 { 144 {
143 } 145 }
144 146
145 public void timer() 147 public void timer(uint localID, LLUUID itemID)
146 { 148 {
147 } 149 }
148 150
149 public void listen() 151 public void listen(uint localID, LLUUID itemID)
150 { 152 {
151 } 153 }
152 154
153 public void on_rez() 155 public void on_rez(uint localID, LLUUID itemID)
154 { 156 {
155 } 157 }
156 158
157 public void sensor() 159 public void sensor(uint localID, LLUUID itemID)
158 { 160 {
159 } 161 }
160 162
161 public void no_sensor() 163 public void no_sensor(uint localID, LLUUID itemID)
162 { 164 {
163 } 165 }
164 166
165 public void control() 167 public void control(uint localID, LLUUID itemID)
166 { 168 {
167 } 169 }
168 170
169 public void money() 171 public void money(uint localID, LLUUID itemID)
170 { 172 {
171 } 173 }
172 174
173 public void email() 175 public void email(uint localID, LLUUID itemID)
174 { 176 {
175 } 177 }
176 178
177 public void at_target() 179 public void at_target(uint localID, LLUUID itemID)
178 { 180 {
179 } 181 }
180 182
181 public void not_at_target() 183 public void not_at_target(uint localID, LLUUID itemID)
182 { 184 {
183 } 185 }
184 186
185 public void at_rot_target() 187 public void at_rot_target(uint localID, LLUUID itemID)
186 { 188 {
187 } 189 }
188 190
189 public void not_at_rot_target() 191 public void not_at_rot_target(uint localID, LLUUID itemID)
190 { 192 {
191 } 193 }
192 194
193 public void run_time_permissions() 195 public void run_time_permissions(uint localID, LLUUID itemID)
194 { 196 {
195 } 197 }
196 198
197 public void changed() 199 public void changed(uint localID, LLUUID itemID)
198 { 200 {
199 } 201 }
200 202
201 public void attach() 203 public void attach(uint localID, LLUUID itemID)
202 { 204 {
203 } 205 }
204 206
205 public void dataserver() 207 public void dataserver(uint localID, LLUUID itemID)
206 { 208 {
207 } 209 }
208 210
209 public void link_message() 211 public void link_message(uint localID, LLUUID itemID)
210 { 212 {
211 } 213 }
212 214
213 public void moving_start() 215 public void moving_start(uint localID, LLUUID itemID)
214 { 216 {
215 } 217 }
216 218
217 public void moving_end() 219 public void moving_end(uint localID, LLUUID itemID)
218 { 220 {
219 } 221 }
220 222
221 public void object_rez() 223 public void object_rez(uint localID, LLUUID itemID)
222 { 224 {
223 } 225 }
224 226
225 public void remote_data() 227 public void remote_data(uint localID, LLUUID itemID)
226 { 228 {
227 } 229 }
228 230
229 public void http_response() 231 public void http_response(uint localID, LLUUID itemID)
230 { 232 {
231 } 233 }
232 } 234 }
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs
index fabce6a..11419be 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs
@@ -41,10 +41,10 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
41 [Serializable] 41 [Serializable]
42 public class ScriptEngine : IRegionModule 42 public class ScriptEngine : IRegionModule
43 { 43 {
44 internal Scene World; 44 public Scene World;
45 internal EventManager m_EventManager; // Handles and queues incoming events from OpenSim 45 public EventManager m_EventManager; // Handles and queues incoming events from OpenSim
46 internal EventQueueManager m_EventQueueManager; // Executes events 46 internal EventQueueManager m_EventQueueManager; // Executes events
47 internal ScriptManager m_ScriptManager; // Load, unload and execute scripts 47 public ScriptManager m_ScriptManager; // Load, unload and execute scripts
48 internal AppDomainManager m_AppDomainManager; 48 internal AppDomainManager m_AppDomainManager;
49 internal LSLLongCmdHandler m_LSLLongCmdHandler; 49 internal LSLLongCmdHandler m_LSLLongCmdHandler;
50 50
@@ -86,14 +86,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
86 // We are shutting down 86 // We are shutting down
87 } 87 }
88 88
89 //// !!!FOR DEBUGGING ONLY!!! (for executing script directly from test app) 89
90 //[Obsolete("!!!FOR DEBUGGING ONLY!!!")]
91 //public void StartScript(string ScriptID, IScriptHost ObjectID)
92 //{
93 // this.myEventManager.TEMP_OBJECT_ID = ObjectID;
94 // Log.Status("ScriptEngine", "DEBUG FUNCTION: StartScript: " + ScriptID);
95 // myScriptManager.StartScript(ScriptID, ObjectID);
96 //}
97 90
98 #region IRegionModule 91 #region IRegionModule
99 92
@@ -112,7 +105,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
112 105
113 public string Name 106 public string Name
114 { 107 {
115 get { return "LSLScriptingModule"; } 108 get { return "DotNetEngine"; }
116 } 109 }
117 110
118 public bool IsSharedModule 111 public bool IsSharedModule