aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/RemoteServer
diff options
context:
space:
mode:
authorJeff Ames2007-12-31 12:00:40 +0000
committerJeff Ames2007-12-31 12:00:40 +0000
commit3c9505199a1ff61a3fc9bf1bc6d9592276a8fda1 (patch)
treec96852dedf4ce6a93309b7f74f62f6b025f90b60 /OpenSim/Region/ScriptEngine/RemoteServer
parentChanged from "Load all .dll's in ScriptEngine" to "Load only DotNetEngine" (t... (diff)
downloadopensim-SC-3c9505199a1ff61a3fc9bf1bc6d9592276a8fda1.zip
opensim-SC-3c9505199a1ff61a3fc9bf1bc6d9592276a8fda1.tar.gz
opensim-SC-3c9505199a1ff61a3fc9bf1bc6d9592276a8fda1.tar.bz2
opensim-SC-3c9505199a1ff61a3fc9bf1bc6d9592276a8fda1.tar.xz
Set svn:eol-style and svn:ignore.
Diffstat (limited to 'OpenSim/Region/ScriptEngine/RemoteServer')
-rw-r--r--OpenSim/Region/ScriptEngine/RemoteServer/Common.cs112
-rw-r--r--OpenSim/Region/ScriptEngine/RemoteServer/EventManager.cs944
-rw-r--r--OpenSim/Region/ScriptEngine/RemoteServer/Properties/AssemblyInfo.cs74
-rw-r--r--OpenSim/Region/ScriptEngine/RemoteServer/RemoteServer.cs116
-rw-r--r--OpenSim/Region/ScriptEngine/RemoteServer/ScriptEngine.cs210
5 files changed, 728 insertions, 728 deletions
diff --git a/OpenSim/Region/ScriptEngine/RemoteServer/Common.cs b/OpenSim/Region/ScriptEngine/RemoteServer/Common.cs
index 906c157..bac32cb 100644
--- a/OpenSim/Region/ScriptEngine/RemoteServer/Common.cs
+++ b/OpenSim/Region/ScriptEngine/RemoteServer/Common.cs
@@ -1,57 +1,57 @@
1/* 1/*
2* Copyright (c) Contributors, http://opensimulator.org/ 2* Copyright (c) Contributors, http://opensimulator.org/
3* See CONTRIBUTORS.TXT for a full list of copyright holders. 3* See CONTRIBUTORS.TXT for a full list of copyright holders.
4* 4*
5* Redistribution and use in source and binary forms, with or without 5* Redistribution and use in source and binary forms, with or without
6* modification, are permitted provided that the following conditions are met: 6* modification, are permitted provided that the following conditions are met:
7* * Redistributions of source code must retain the above copyright 7* * Redistributions of source code must retain the above copyright
8* notice, this list of conditions and the following disclaimer. 8* notice, this list of conditions and the following disclaimer.
9* * Redistributions in binary form must reproduce the above copyright 9* * Redistributions in binary form must reproduce the above copyright
10* notice, this list of conditions and the following disclaimer in the 10* notice, this list of conditions and the following disclaimer in the
11* documentation and/or other materials provided with the distribution. 11* documentation and/or other materials provided with the distribution.
12* * Neither the name of the OpenSim Project nor the 12* * Neither the name of the OpenSim Project nor the
13* names of its contributors may be used to endorse or promote products 13* names of its contributors may be used to endorse or promote products
14* derived from this software without specific prior written permission. 14* derived from this software without specific prior written permission.
15* 15*
16* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY 16* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
17* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 17* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 18* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY 19* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 20* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 21* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 22* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 23* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 24* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26* 26*
27*/ 27*/
28/* Original code: Tedd Hansen */ 28/* Original code: Tedd Hansen */
29namespace OpenSim.Region.ScriptEngine.RemoteServer 29namespace OpenSim.Region.ScriptEngine.RemoteServer
30{ 30{
31 public static class Common 31 public static class Common
32 { 32 {
33 public static bool debug = true; 33 public static bool debug = true;
34 public static ScriptEngine mySE; 34 public static ScriptEngine mySE;
35 35
36 // This class just contains some static log stuff used for debugging. 36 // This class just contains some static log stuff used for debugging.
37 37
38 //public delegate void SendToDebugEventDelegate(string Message); 38 //public delegate void SendToDebugEventDelegate(string Message);
39 //public delegate void SendToLogEventDelegate(string Message); 39 //public delegate void SendToLogEventDelegate(string Message);
40 //static public event SendToDebugEventDelegate SendToDebugEvent; 40 //static public event SendToDebugEventDelegate SendToDebugEvent;
41 //static public event SendToLogEventDelegate SendToLogEvent; 41 //static public event SendToLogEventDelegate SendToLogEvent;
42 42
43 public static void SendToDebug(string Message) 43 public static void SendToDebug(string Message)
44 { 44 {
45 //if (Debug == true) 45 //if (Debug == true)
46 mySE.Log.Verbose("ScriptEngine", "Debug: " + Message); 46 mySE.Log.Verbose("ScriptEngine", "Debug: " + Message);
47 //SendToDebugEvent("\r\n" + DateTime.Now.ToString("[HH:mm:ss] ") + Message); 47 //SendToDebugEvent("\r\n" + DateTime.Now.ToString("[HH:mm:ss] ") + Message);
48 } 48 }
49 49
50 public static void SendToLog(string Message) 50 public static void SendToLog(string Message)
51 { 51 {
52 //if (Debug == true) 52 //if (Debug == true)
53 mySE.Log.Verbose("ScriptEngine", "LOG: " + Message); 53 mySE.Log.Verbose("ScriptEngine", "LOG: " + Message);
54 //SendToLogEvent("\r\n" + DateTime.Now.ToString("[HH:mm:ss] ") + Message); 54 //SendToLogEvent("\r\n" + DateTime.Now.ToString("[HH:mm:ss] ") + Message);
55 } 55 }
56 } 56 }
57} \ No newline at end of file 57} \ No newline at end of file
diff --git a/OpenSim/Region/ScriptEngine/RemoteServer/EventManager.cs b/OpenSim/Region/ScriptEngine/RemoteServer/EventManager.cs
index 5561563..812b1c0 100644
--- a/OpenSim/Region/ScriptEngine/RemoteServer/EventManager.cs
+++ b/OpenSim/Region/ScriptEngine/RemoteServer/EventManager.cs
@@ -1,473 +1,473 @@
1/* 1/*
2* Copyright (c) Contributors, http://opensimulator.org/ 2* Copyright (c) Contributors, http://opensimulator.org/
3* See CONTRIBUTORS.TXT for a full list of copyright holders. 3* See CONTRIBUTORS.TXT for a full list of copyright holders.
4* 4*
5* Redistribution and use in source and binary forms, with or without 5* Redistribution and use in source and binary forms, with or without
6* modification, are permitted provided that the following conditions are met: 6* modification, are permitted provided that the following conditions are met:
7* * Redistributions of source code must retain the above copyright 7* * Redistributions of source code must retain the above copyright
8* notice, this list of conditions and the following disclaimer. 8* notice, this list of conditions and the following disclaimer.
9* * Redistributions in binary form must reproduce the above copyright 9* * Redistributions in binary form must reproduce the above copyright
10* notice, this list of conditions and the following disclaimer in the 10* notice, this list of conditions and the following disclaimer in the
11* documentation and/or other materials provided with the distribution. 11* documentation and/or other materials provided with the distribution.
12* * Neither the name of the OpenSim Project nor the 12* * Neither the name of the OpenSim Project nor the
13* names of its contributors may be used to endorse or promote products 13* names of its contributors may be used to endorse or promote products
14* derived from this software without specific prior written permission. 14* derived from this software without specific prior written permission.
15* 15*
16* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY 16* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
17* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 17* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 18* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY 19* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 20* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 21* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 22* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 23* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 24* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26* 26*
27*/ 27*/
28/* Original code: Tedd Hansen */ 28/* Original code: Tedd Hansen */
29using System; 29using System;
30using libsecondlife; 30using libsecondlife;
31using OpenSim.Framework; 31using OpenSim.Framework;
32using OpenSim.Grid.ScriptServer; 32using OpenSim.Grid.ScriptServer;
33using OpenSim.Region.ScriptEngine.DotNetEngine; 33using OpenSim.Region.ScriptEngine.DotNetEngine;
34 34
35namespace OpenSim.Region.ScriptEngine.RemoteServer 35namespace OpenSim.Region.ScriptEngine.RemoteServer
36{ 36{
37 /// <summary> 37 /// <summary>
38 /// Handles events from OpenSim. Uses RemoteServer to send commands. 38 /// Handles events from OpenSim. Uses RemoteServer to send commands.
39 /// </summary> 39 /// </summary>
40 [Serializable] 40 [Serializable]
41 internal class EventManager 41 internal class EventManager
42 { 42 {
43 43
44 System.Collections.Generic.Dictionary<uint, RemotingObject> remoteScript = new System.Collections.Generic.Dictionary<uint, OpenSim.Grid.ScriptServer.RemotingObject>(); 44 System.Collections.Generic.Dictionary<uint, RemotingObject> remoteScript = new System.Collections.Generic.Dictionary<uint, OpenSim.Grid.ScriptServer.RemotingObject>();
45 45
46 46
47 private ScriptEngine myScriptEngine; 47 private ScriptEngine myScriptEngine;
48 public EventManager(ScriptEngine _ScriptEngine) 48 public EventManager(ScriptEngine _ScriptEngine)
49 { 49 {
50 myScriptEngine = _ScriptEngine; 50 myScriptEngine = _ScriptEngine;
51 51
52 myScriptEngine.Log.Verbose("RemoteEngine", "Hooking up to server events"); 52 myScriptEngine.Log.Verbose("RemoteEngine", "Hooking up to server events");
53 //myScriptEngine.World.EventManager.OnObjectGrab += touch_start; 53 //myScriptEngine.World.EventManager.OnObjectGrab += touch_start;
54 myScriptEngine.World.EventManager.OnRezScript += OnRezScript; 54 myScriptEngine.World.EventManager.OnRezScript += OnRezScript;
55 //myScriptEngine.World.EventManager.OnRemoveScript += OnRemoveScript; 55 //myScriptEngine.World.EventManager.OnRemoveScript += OnRemoveScript;
56 56
57 57
58 } 58 }
59 59
60 60
61 public void OnRezScript(uint localID, LLUUID itemID, string script) 61 public void OnRezScript(uint localID, LLUUID itemID, string script)
62 { 62 {
63 // WE ARE CREATING A NEW SCRIPT ... CREATE SCRIPT, GET A REMOTEID THAT WE MAP FROM LOCALID 63 // WE ARE CREATING A NEW SCRIPT ... CREATE SCRIPT, GET A REMOTEID THAT WE MAP FROM LOCALID
64 OpenSim.Grid.ScriptServer.RemotingObject obj = myScriptEngine.m_RemoteServer.Connect("localhost", 1234); 64 OpenSim.Grid.ScriptServer.RemotingObject obj = myScriptEngine.m_RemoteServer.Connect("localhost", 1234);
65 remoteScript.Add(localID, obj); 65 remoteScript.Add(localID, obj);
66 try 66 try
67 { 67 {
68 remoteScript[localID].ScriptEngine.m_EventManager.OnRezScript(localID, itemID, script); 68 remoteScript[localID].ScriptEngine.m_EventManager.OnRezScript(localID, itemID, script);
69 } 69 }
70 catch (System.NullReferenceException) 70 catch (System.NullReferenceException)
71 { 71 {
72 OpenSim.Framework.Console.MainLog.Instance.Error("SCRIPTS", "Error Connecting to Remote Script Server. Is it running?"); 72 OpenSim.Framework.Console.MainLog.Instance.Error("SCRIPTS", "Error Connecting to Remote Script Server. Is it running?");
73 } 73 }
74 } 74 }
75 75
76 public void touch_start(uint localID, LLVector3 offsetPos, IClientAPI remoteClient) 76 public void touch_start(uint localID, LLVector3 offsetPos, IClientAPI remoteClient)
77 { 77 {
78 try 78 try
79 { 79 {
80 remoteScript[localID].ScriptEngine.m_EventManager.touch_start(localID, offsetPos, remoteClient); 80 remoteScript[localID].ScriptEngine.m_EventManager.touch_start(localID, offsetPos, remoteClient);
81 } 81 }
82 catch (System.NullReferenceException) 82 catch (System.NullReferenceException)
83 { 83 {
84 OpenSim.Framework.Console.MainLog.Instance.Error("SCRIPTS", "Error Connecting to Remote Script Server. Is it running?"); 84 OpenSim.Framework.Console.MainLog.Instance.Error("SCRIPTS", "Error Connecting to Remote Script Server. Is it running?");
85 } 85 }
86 } 86 }
87 87
88 public void OnRemoveScript(uint localID, LLUUID itemID) 88 public void OnRemoveScript(uint localID, LLUUID itemID)
89 { 89 {
90 try 90 try
91 { 91 {
92 remoteScript[localID].ScriptEngine.m_EventManager.OnRemoveScript(localID, itemID); 92 remoteScript[localID].ScriptEngine.m_EventManager.OnRemoveScript(localID, itemID);
93 } 93 }
94 catch (System.NullReferenceException) 94 catch (System.NullReferenceException)
95 { 95 {
96 OpenSim.Framework.Console.MainLog.Instance.Error("SCRIPTS", "Error Connecting to Remote Script Server. Is it running?"); 96 OpenSim.Framework.Console.MainLog.Instance.Error("SCRIPTS", "Error Connecting to Remote Script Server. Is it running?");
97 } 97 }
98 } 98 }
99 99
100 public void state_exit(uint localID, LLUUID itemID) 100 public void state_exit(uint localID, LLUUID itemID)
101 { 101 {
102 try 102 try
103 { 103 {
104 remoteScript[localID].ScriptEngine.m_EventManager.state_exit(localID, itemID); 104 remoteScript[localID].ScriptEngine.m_EventManager.state_exit(localID, itemID);
105 } 105 }
106 catch (System.NullReferenceException) 106 catch (System.NullReferenceException)
107 { 107 {
108 OpenSim.Framework.Console.MainLog.Instance.Error("SCRIPTS", "Error Connecting to Remote Script Server. Is it running?"); 108 OpenSim.Framework.Console.MainLog.Instance.Error("SCRIPTS", "Error Connecting to Remote Script Server. Is it running?");
109 } 109 }
110 } 110 }
111 111
112 public void touch(uint localID, LLUUID itemID) 112 public void touch(uint localID, LLUUID itemID)
113 { 113 {
114 try 114 try
115 { 115 {
116 remoteScript[localID].ScriptEngine.m_EventManager.touch(localID, itemID); 116 remoteScript[localID].ScriptEngine.m_EventManager.touch(localID, itemID);
117 } 117 }
118 catch (System.NullReferenceException) 118 catch (System.NullReferenceException)
119 { 119 {
120 OpenSim.Framework.Console.MainLog.Instance.Error("SCRIPTS", "Error Connecting to Remote Script Server. Is it running?"); 120 OpenSim.Framework.Console.MainLog.Instance.Error("SCRIPTS", "Error Connecting to Remote Script Server. Is it running?");
121 } 121 }
122 } 122 }
123 123
124 public void touch_end(uint localID, LLUUID itemID) 124 public void touch_end(uint localID, LLUUID itemID)
125 { 125 {
126 try 126 try
127 { 127 {
128 remoteScript[localID].ScriptEngine.m_EventManager.touch_end(localID, itemID); 128 remoteScript[localID].ScriptEngine.m_EventManager.touch_end(localID, itemID);
129 } 129 }
130 catch (System.NullReferenceException) 130 catch (System.NullReferenceException)
131 { 131 {
132 OpenSim.Framework.Console.MainLog.Instance.Error("SCRIPTS", "Error Connecting to Remote Script Server. Is it running?"); 132 OpenSim.Framework.Console.MainLog.Instance.Error("SCRIPTS", "Error Connecting to Remote Script Server. Is it running?");
133 } 133 }
134 } 134 }
135 135
136 public void collision_start(uint localID, LLUUID itemID) 136 public void collision_start(uint localID, LLUUID itemID)
137 { 137 {
138 try 138 try
139 { 139 {
140 remoteScript[localID].ScriptEngine.m_EventManager.collision_start(localID, itemID); 140 remoteScript[localID].ScriptEngine.m_EventManager.collision_start(localID, itemID);
141 } 141 }
142 catch (System.NullReferenceException) 142 catch (System.NullReferenceException)
143 { 143 {
144 OpenSim.Framework.Console.MainLog.Instance.Error("SCRIPTS", "Error Connecting to Remote Script Server. Is it running?"); 144 OpenSim.Framework.Console.MainLog.Instance.Error("SCRIPTS", "Error Connecting to Remote Script Server. Is it running?");
145 } 145 }
146 } 146 }
147 147
148 public void collision(uint localID, LLUUID itemID) 148 public void collision(uint localID, LLUUID itemID)
149 { 149 {
150 try 150 try
151 { 151 {
152 remoteScript[localID].ScriptEngine.m_EventManager.collision(localID, itemID); 152 remoteScript[localID].ScriptEngine.m_EventManager.collision(localID, itemID);
153 } 153 }
154 catch (System.NullReferenceException) 154 catch (System.NullReferenceException)
155 { 155 {
156 OpenSim.Framework.Console.MainLog.Instance.Error("SCRIPTS", "Error Connecting to Remote Script Server. Is it running?"); 156 OpenSim.Framework.Console.MainLog.Instance.Error("SCRIPTS", "Error Connecting to Remote Script Server. Is it running?");
157 } 157 }
158 } 158 }
159 159
160 public void collision_end(uint localID, LLUUID itemID) 160 public void collision_end(uint localID, LLUUID itemID)
161 { 161 {
162 try 162 try
163 { 163 {
164 remoteScript[localID].ScriptEngine.m_EventManager.collision_end(localID, itemID); 164 remoteScript[localID].ScriptEngine.m_EventManager.collision_end(localID, itemID);
165 } 165 }
166 catch (System.NullReferenceException) 166 catch (System.NullReferenceException)
167 { 167 {
168 OpenSim.Framework.Console.MainLog.Instance.Error("SCRIPTS", "Error Connecting to Remote Script Server. Is it running?"); 168 OpenSim.Framework.Console.MainLog.Instance.Error("SCRIPTS", "Error Connecting to Remote Script Server. Is it running?");
169 } 169 }
170 } 170 }
171 171
172 public void land_collision_start(uint localID, LLUUID itemID) 172 public void land_collision_start(uint localID, LLUUID itemID)
173 { 173 {
174 try 174 try
175 { 175 {
176 remoteScript[localID].ScriptEngine.m_EventManager.land_collision_start(localID, itemID); 176 remoteScript[localID].ScriptEngine.m_EventManager.land_collision_start(localID, itemID);
177 } 177 }
178 catch (System.NullReferenceException) 178 catch (System.NullReferenceException)
179 { 179 {
180 OpenSim.Framework.Console.MainLog.Instance.Error("SCRIPTS", "Error Connecting to Remote Script Server. Is it running?"); 180 OpenSim.Framework.Console.MainLog.Instance.Error("SCRIPTS", "Error Connecting to Remote Script Server. Is it running?");
181 } 181 }
182 } 182 }
183 183
184 public void land_collision(uint localID, LLUUID itemID) 184 public void land_collision(uint localID, LLUUID itemID)
185 { 185 {
186 try 186 try
187 { 187 {
188 remoteScript[localID].ScriptEngine.m_EventManager.land_collision(localID, itemID); 188 remoteScript[localID].ScriptEngine.m_EventManager.land_collision(localID, itemID);
189 } 189 }
190 catch (System.NullReferenceException) 190 catch (System.NullReferenceException)
191 { 191 {
192 OpenSim.Framework.Console.MainLog.Instance.Error("SCRIPTS", "Error Connecting to Remote Script Server. Is it running?"); 192 OpenSim.Framework.Console.MainLog.Instance.Error("SCRIPTS", "Error Connecting to Remote Script Server. Is it running?");
193 } 193 }
194 } 194 }
195 195
196 public void land_collision_end(uint localID, LLUUID itemID) 196 public void land_collision_end(uint localID, LLUUID itemID)
197 { 197 {
198 try 198 try
199 { 199 {
200 remoteScript[localID].ScriptEngine.m_EventManager.land_collision_end(localID, itemID); 200 remoteScript[localID].ScriptEngine.m_EventManager.land_collision_end(localID, itemID);
201 } 201 }
202 catch (System.NullReferenceException) 202 catch (System.NullReferenceException)
203 { 203 {
204 OpenSim.Framework.Console.MainLog.Instance.Error("SCRIPTS", "Error Connecting to Remote Script Server. Is it running?"); 204 OpenSim.Framework.Console.MainLog.Instance.Error("SCRIPTS", "Error Connecting to Remote Script Server. Is it running?");
205 } 205 }
206 } 206 }
207 207
208 public void timer(uint localID, LLUUID itemID) 208 public void timer(uint localID, LLUUID itemID)
209 { 209 {
210 try 210 try
211 { 211 {
212 remoteScript[localID].ScriptEngine.m_EventManager.timer(localID, itemID); 212 remoteScript[localID].ScriptEngine.m_EventManager.timer(localID, itemID);
213 } 213 }
214 catch (System.NullReferenceException) 214 catch (System.NullReferenceException)
215 { 215 {
216 OpenSim.Framework.Console.MainLog.Instance.Error("SCRIPTS", "Error Connecting to Remote Script Server. Is it running?"); 216 OpenSim.Framework.Console.MainLog.Instance.Error("SCRIPTS", "Error Connecting to Remote Script Server. Is it running?");
217 } 217 }
218 } 218 }
219 219
220 public void listen(uint localID, LLUUID itemID) 220 public void listen(uint localID, LLUUID itemID)
221 { 221 {
222 try 222 try
223 { 223 {
224 remoteScript[localID].ScriptEngine.m_EventManager.listen(localID, itemID); 224 remoteScript[localID].ScriptEngine.m_EventManager.listen(localID, itemID);
225 } 225 }
226 catch (System.NullReferenceException) 226 catch (System.NullReferenceException)
227 { 227 {
228 OpenSim.Framework.Console.MainLog.Instance.Error("SCRIPTS", "Error Connecting to Remote Script Server. Is it running?"); 228 OpenSim.Framework.Console.MainLog.Instance.Error("SCRIPTS", "Error Connecting to Remote Script Server. Is it running?");
229 } 229 }
230 } 230 }
231 231
232 public void on_rez(uint localID, LLUUID itemID) 232 public void on_rez(uint localID, LLUUID itemID)
233 { 233 {
234 try 234 try
235 { 235 {
236 remoteScript[localID].ScriptEngine.m_EventManager.on_rez(localID, itemID); 236 remoteScript[localID].ScriptEngine.m_EventManager.on_rez(localID, itemID);
237 } 237 }
238 catch (System.NullReferenceException) 238 catch (System.NullReferenceException)
239 { 239 {
240 OpenSim.Framework.Console.MainLog.Instance.Error("SCRIPTS", "Error Connecting to Remote Script Server. Is it running?"); 240 OpenSim.Framework.Console.MainLog.Instance.Error("SCRIPTS", "Error Connecting to Remote Script Server. Is it running?");
241 } 241 }
242 } 242 }
243 243
244 public void sensor(uint localID, LLUUID itemID) 244 public void sensor(uint localID, LLUUID itemID)
245 { 245 {
246 try 246 try
247 { 247 {
248 remoteScript[localID].ScriptEngine.m_EventManager.sensor(localID, itemID); 248 remoteScript[localID].ScriptEngine.m_EventManager.sensor(localID, itemID);
249 } 249 }
250 catch (System.NullReferenceException) 250 catch (System.NullReferenceException)
251 { 251 {
252 OpenSim.Framework.Console.MainLog.Instance.Error("SCRIPTS", "Error Connecting to Remote Script Server. Is it running?"); 252 OpenSim.Framework.Console.MainLog.Instance.Error("SCRIPTS", "Error Connecting to Remote Script Server. Is it running?");
253 } 253 }
254 } 254 }
255 255
256 public void no_sensor(uint localID, LLUUID itemID) 256 public void no_sensor(uint localID, LLUUID itemID)
257 { 257 {
258 try 258 try
259 { 259 {
260 remoteScript[localID].ScriptEngine.m_EventManager.no_sensor(localID, itemID); 260 remoteScript[localID].ScriptEngine.m_EventManager.no_sensor(localID, itemID);
261 } 261 }
262 catch (System.NullReferenceException) 262 catch (System.NullReferenceException)
263 { 263 {
264 OpenSim.Framework.Console.MainLog.Instance.Error("SCRIPTS", "Error Connecting to Remote Script Server. Is it running?"); 264 OpenSim.Framework.Console.MainLog.Instance.Error("SCRIPTS", "Error Connecting to Remote Script Server. Is it running?");
265 } 265 }
266 } 266 }
267 267
268 public void control(uint localID, LLUUID itemID) 268 public void control(uint localID, LLUUID itemID)
269 { 269 {
270 try 270 try
271 { 271 {
272 remoteScript[localID].ScriptEngine.m_EventManager.control(localID, itemID); 272 remoteScript[localID].ScriptEngine.m_EventManager.control(localID, itemID);
273 } 273 }
274 catch (System.NullReferenceException) 274 catch (System.NullReferenceException)
275 { 275 {
276 OpenSim.Framework.Console.MainLog.Instance.Error("SCRIPTS", "Error Connecting to Remote Script Server. Is it running?"); 276 OpenSim.Framework.Console.MainLog.Instance.Error("SCRIPTS", "Error Connecting to Remote Script Server. Is it running?");
277 } 277 }
278 } 278 }
279 279
280 public void money(uint localID, LLUUID itemID) 280 public void money(uint localID, LLUUID itemID)
281 { 281 {
282 try 282 try
283 { 283 {
284 remoteScript[localID].ScriptEngine.m_EventManager.money(localID, itemID); 284 remoteScript[localID].ScriptEngine.m_EventManager.money(localID, itemID);
285 } 285 }
286 catch (System.NullReferenceException) 286 catch (System.NullReferenceException)
287 { 287 {
288 OpenSim.Framework.Console.MainLog.Instance.Error("SCRIPTS", "Error Connecting to Remote Script Server. Is it running?"); 288 OpenSim.Framework.Console.MainLog.Instance.Error("SCRIPTS", "Error Connecting to Remote Script Server. Is it running?");
289 } 289 }
290 } 290 }
291 291
292 public void email(uint localID, LLUUID itemID) 292 public void email(uint localID, LLUUID itemID)
293 { 293 {
294 try 294 try
295 { 295 {
296 remoteScript[localID].ScriptEngine.m_EventManager.email(localID, itemID); 296 remoteScript[localID].ScriptEngine.m_EventManager.email(localID, itemID);
297 } 297 }
298 catch (System.NullReferenceException) 298 catch (System.NullReferenceException)
299 { 299 {
300 OpenSim.Framework.Console.MainLog.Instance.Error("SCRIPTS", "Error Connecting to Remote Script Server. Is it running?"); 300 OpenSim.Framework.Console.MainLog.Instance.Error("SCRIPTS", "Error Connecting to Remote Script Server. Is it running?");
301 } 301 }
302 } 302 }
303 303
304 public void at_target(uint localID, LLUUID itemID) 304 public void at_target(uint localID, LLUUID itemID)
305 { 305 {
306 try 306 try
307 { 307 {
308 remoteScript[localID].ScriptEngine.m_EventManager.at_target(localID, itemID); 308 remoteScript[localID].ScriptEngine.m_EventManager.at_target(localID, itemID);
309 } 309 }
310 catch (System.NullReferenceException) 310 catch (System.NullReferenceException)
311 { 311 {
312 OpenSim.Framework.Console.MainLog.Instance.Error("SCRIPTS", "Error Connecting to Remote Script Server. Is it running?"); 312 OpenSim.Framework.Console.MainLog.Instance.Error("SCRIPTS", "Error Connecting to Remote Script Server. Is it running?");
313 } 313 }
314 } 314 }
315 315
316 public void not_at_target(uint localID, LLUUID itemID) 316 public void not_at_target(uint localID, LLUUID itemID)
317 { 317 {
318 try 318 try
319 { 319 {
320 remoteScript[localID].ScriptEngine.m_EventManager.not_at_target(localID, itemID); 320 remoteScript[localID].ScriptEngine.m_EventManager.not_at_target(localID, itemID);
321 } 321 }
322 catch (System.NullReferenceException) 322 catch (System.NullReferenceException)
323 { 323 {
324 OpenSim.Framework.Console.MainLog.Instance.Error("SCRIPTS", "Error Connecting to Remote Script Server. Is it running?"); 324 OpenSim.Framework.Console.MainLog.Instance.Error("SCRIPTS", "Error Connecting to Remote Script Server. Is it running?");
325 } 325 }
326 } 326 }
327 327
328 public void at_rot_target(uint localID, LLUUID itemID) 328 public void at_rot_target(uint localID, LLUUID itemID)
329 { 329 {
330 try 330 try
331 { 331 {
332 remoteScript[localID].ScriptEngine.m_EventManager.at_rot_target(localID, itemID); 332 remoteScript[localID].ScriptEngine.m_EventManager.at_rot_target(localID, itemID);
333 } 333 }
334 catch (System.NullReferenceException) 334 catch (System.NullReferenceException)
335 { 335 {
336 OpenSim.Framework.Console.MainLog.Instance.Error("SCRIPTS", "Error Connecting to Remote Script Server. Is it running?"); 336 OpenSim.Framework.Console.MainLog.Instance.Error("SCRIPTS", "Error Connecting to Remote Script Server. Is it running?");
337 } 337 }
338 } 338 }
339 339
340 public void not_at_rot_target(uint localID, LLUUID itemID) 340 public void not_at_rot_target(uint localID, LLUUID itemID)
341 { 341 {
342 try 342 try
343 { 343 {
344 remoteScript[localID].ScriptEngine.m_EventManager.not_at_rot_target(localID, itemID); 344 remoteScript[localID].ScriptEngine.m_EventManager.not_at_rot_target(localID, itemID);
345 } 345 }
346 catch (System.NullReferenceException) 346 catch (System.NullReferenceException)
347 { 347 {
348 OpenSim.Framework.Console.MainLog.Instance.Error("SCRIPTS", "Error Connecting to Remote Script Server. Is it running?"); 348 OpenSim.Framework.Console.MainLog.Instance.Error("SCRIPTS", "Error Connecting to Remote Script Server. Is it running?");
349 } 349 }
350 } 350 }
351 351
352 public void run_time_permissions(uint localID, LLUUID itemID) 352 public void run_time_permissions(uint localID, LLUUID itemID)
353 { 353 {
354 try 354 try
355 { 355 {
356 remoteScript[localID].ScriptEngine.m_EventManager.run_time_permissions(localID, itemID); 356 remoteScript[localID].ScriptEngine.m_EventManager.run_time_permissions(localID, itemID);
357 } 357 }
358 catch (System.NullReferenceException) 358 catch (System.NullReferenceException)
359 { 359 {
360 OpenSim.Framework.Console.MainLog.Instance.Error("SCRIPTS", "Error Connecting to Remote Script Server. Is it running?"); 360 OpenSim.Framework.Console.MainLog.Instance.Error("SCRIPTS", "Error Connecting to Remote Script Server. Is it running?");
361 } 361 }
362 } 362 }
363 363
364 public void changed(uint localID, LLUUID itemID) 364 public void changed(uint localID, LLUUID itemID)
365 { 365 {
366 try 366 try
367 { 367 {
368 remoteScript[localID].ScriptEngine.m_EventManager.changed(localID, itemID); 368 remoteScript[localID].ScriptEngine.m_EventManager.changed(localID, itemID);
369 } 369 }
370 catch (System.NullReferenceException) 370 catch (System.NullReferenceException)
371 { 371 {
372 OpenSim.Framework.Console.MainLog.Instance.Error("SCRIPTS", "Error Connecting to Remote Script Server. Is it running?"); 372 OpenSim.Framework.Console.MainLog.Instance.Error("SCRIPTS", "Error Connecting to Remote Script Server. Is it running?");
373 } 373 }
374 } 374 }
375 375
376 public void attach(uint localID, LLUUID itemID) 376 public void attach(uint localID, LLUUID itemID)
377 { 377 {
378 try 378 try
379 { 379 {
380 remoteScript[localID].ScriptEngine.m_EventManager.attach(localID, itemID); 380 remoteScript[localID].ScriptEngine.m_EventManager.attach(localID, itemID);
381 } 381 }
382 catch (System.NullReferenceException) 382 catch (System.NullReferenceException)
383 { 383 {
384 OpenSim.Framework.Console.MainLog.Instance.Error("SCRIPTS", "Error Connecting to Remote Script Server. Is it running?"); 384 OpenSim.Framework.Console.MainLog.Instance.Error("SCRIPTS", "Error Connecting to Remote Script Server. Is it running?");
385 } 385 }
386 } 386 }
387 387
388 public void dataserver(uint localID, LLUUID itemID) 388 public void dataserver(uint localID, LLUUID itemID)
389 { 389 {
390 try 390 try
391 { 391 {
392 remoteScript[localID].ScriptEngine.m_EventManager.dataserver(localID, itemID); 392 remoteScript[localID].ScriptEngine.m_EventManager.dataserver(localID, itemID);
393 } 393 }
394 catch (System.NullReferenceException) 394 catch (System.NullReferenceException)
395 { 395 {
396 OpenSim.Framework.Console.MainLog.Instance.Error("SCRIPTS", "Error Connecting to Remote Script Server. Is it running?"); 396 OpenSim.Framework.Console.MainLog.Instance.Error("SCRIPTS", "Error Connecting to Remote Script Server. Is it running?");
397 } 397 }
398 } 398 }
399 399
400 public void link_message(uint localID, LLUUID itemID) 400 public void link_message(uint localID, LLUUID itemID)
401 { 401 {
402 try 402 try
403 { 403 {
404 remoteScript[localID].ScriptEngine.m_EventManager.link_message(localID, itemID); 404 remoteScript[localID].ScriptEngine.m_EventManager.link_message(localID, itemID);
405 } 405 }
406 catch (System.NullReferenceException) 406 catch (System.NullReferenceException)
407 { 407 {
408 OpenSim.Framework.Console.MainLog.Instance.Error("SCRIPTS", "Error Connecting to Remote Script Server. Is it running?"); 408 OpenSim.Framework.Console.MainLog.Instance.Error("SCRIPTS", "Error Connecting to Remote Script Server. Is it running?");
409 } 409 }
410 } 410 }
411 411
412 public void moving_start(uint localID, LLUUID itemID) 412 public void moving_start(uint localID, LLUUID itemID)
413 { 413 {
414 try 414 try
415 { 415 {
416 remoteScript[localID].ScriptEngine.m_EventManager.moving_start(localID, itemID); 416 remoteScript[localID].ScriptEngine.m_EventManager.moving_start(localID, itemID);
417 } 417 }
418 catch (System.NullReferenceException) 418 catch (System.NullReferenceException)
419 { 419 {
420 OpenSim.Framework.Console.MainLog.Instance.Error("SCRIPTS", "Error Connecting to Remote Script Server. Is it running?"); 420 OpenSim.Framework.Console.MainLog.Instance.Error("SCRIPTS", "Error Connecting to Remote Script Server. Is it running?");
421 } 421 }
422 } 422 }
423 423
424 public void moving_end(uint localID, LLUUID itemID) 424 public void moving_end(uint localID, LLUUID itemID)
425 { 425 {
426 try 426 try
427 { 427 {
428 remoteScript[localID].ScriptEngine.m_EventManager.moving_end(localID, itemID); 428 remoteScript[localID].ScriptEngine.m_EventManager.moving_end(localID, itemID);
429 } 429 }
430 catch (System.NullReferenceException) 430 catch (System.NullReferenceException)
431 { 431 {
432 OpenSim.Framework.Console.MainLog.Instance.Error("SCRIPTS", "Error Connecting to Remote Script Server. Is it running?"); 432 OpenSim.Framework.Console.MainLog.Instance.Error("SCRIPTS", "Error Connecting to Remote Script Server. Is it running?");
433 } 433 }
434 } 434 }
435 435
436 public void object_rez(uint localID, LLUUID itemID) 436 public void object_rez(uint localID, LLUUID itemID)
437 { 437 {
438 try 438 try
439 { 439 {
440 remoteScript[localID].ScriptEngine.m_EventManager.object_rez(localID, itemID); 440 remoteScript[localID].ScriptEngine.m_EventManager.object_rez(localID, itemID);
441 } 441 }
442 catch (System.NullReferenceException) 442 catch (System.NullReferenceException)
443 { 443 {
444 OpenSim.Framework.Console.MainLog.Instance.Error("SCRIPTS", "Error Connecting to Remote Script Server. Is it running?"); 444 OpenSim.Framework.Console.MainLog.Instance.Error("SCRIPTS", "Error Connecting to Remote Script Server. Is it running?");
445 } 445 }
446 } 446 }
447 447
448 public void remote_data(uint localID, LLUUID itemID) 448 public void remote_data(uint localID, LLUUID itemID)
449 { 449 {
450 try 450 try
451 { 451 {
452 remoteScript[localID].ScriptEngine.m_EventManager.remote_data(localID, itemID); 452 remoteScript[localID].ScriptEngine.m_EventManager.remote_data(localID, itemID);
453 } 453 }
454 catch (System.NullReferenceException) 454 catch (System.NullReferenceException)
455 { 455 {
456 OpenSim.Framework.Console.MainLog.Instance.Error("SCRIPTS", "Error Connecting to Remote Script Server. Is it running?"); 456 OpenSim.Framework.Console.MainLog.Instance.Error("SCRIPTS", "Error Connecting to Remote Script Server. Is it running?");
457 } 457 }
458 } 458 }
459 459
460 public void http_response(uint localID, LLUUID itemID) 460 public void http_response(uint localID, LLUUID itemID)
461 { 461 {
462 try 462 try
463 { 463 {
464 remoteScript[localID].ScriptEngine.m_EventManager.http_response(localID, itemID); 464 remoteScript[localID].ScriptEngine.m_EventManager.http_response(localID, itemID);
465 } 465 }
466 catch (System.NullReferenceException) 466 catch (System.NullReferenceException)
467 { 467 {
468 OpenSim.Framework.Console.MainLog.Instance.Error("SCRIPTS", "Error Connecting to Remote Script Server. Is it running?"); 468 OpenSim.Framework.Console.MainLog.Instance.Error("SCRIPTS", "Error Connecting to Remote Script Server. Is it running?");
469 } 469 }
470 } 470 }
471 471
472 } 472 }
473} \ No newline at end of file 473} \ No newline at end of file
diff --git a/OpenSim/Region/ScriptEngine/RemoteServer/Properties/AssemblyInfo.cs b/OpenSim/Region/ScriptEngine/RemoteServer/Properties/AssemblyInfo.cs
index b013562..d78caf9 100644
--- a/OpenSim/Region/ScriptEngine/RemoteServer/Properties/AssemblyInfo.cs
+++ b/OpenSim/Region/ScriptEngine/RemoteServer/Properties/AssemblyInfo.cs
@@ -1,38 +1,38 @@
1using System.Reflection; 1using System.Reflection;
2using System.Runtime.InteropServices; 2using System.Runtime.InteropServices;
3 3
4// General Information about an assembly is controlled through the following 4// General Information about an assembly is controlled through the following
5// set of attributes. Change these attribute values to modify the information 5// set of attributes. Change these attribute values to modify the information
6// associated with an assembly. 6// associated with an assembly.
7 7
8[assembly : AssemblyTitle("OpenSim.Region.ScriptEngine.RemoteServer")] 8[assembly : AssemblyTitle("OpenSim.Region.ScriptEngine.RemoteServer")]
9[assembly : AssemblyDescription("")] 9[assembly : AssemblyDescription("")]
10[assembly : AssemblyConfiguration("")] 10[assembly : AssemblyConfiguration("")]
11[assembly : AssemblyCompany("")] 11[assembly : AssemblyCompany("")]
12[assembly : AssemblyProduct("OpenSim.Region.ScriptEngine.RemoteServer")] 12[assembly : AssemblyProduct("OpenSim.Region.ScriptEngine.RemoteServer")]
13[assembly : AssemblyCopyright("Copyright © 2007")] 13[assembly : AssemblyCopyright("Copyright © 2007")]
14[assembly : AssemblyTrademark("")] 14[assembly : AssemblyTrademark("")]
15[assembly : AssemblyCulture("")] 15[assembly : AssemblyCulture("")]
16 16
17// Setting ComVisible to false makes the types in this assembly not visible 17// Setting ComVisible to false makes the types in this assembly not visible
18// to COM components. If you need to access a type in this assembly from 18// to COM components. If you need to access a type in this assembly from
19// COM, set the ComVisible attribute to true on that type. 19// COM, set the ComVisible attribute to true on that type.
20 20
21[assembly : ComVisible(false)] 21[assembly : ComVisible(false)]
22 22
23// The following GUID is for the ID of the typelib if this project is exposed to COM 23// The following GUID is for the ID of the typelib if this project is exposed to COM
24 24
25[assembly : Guid("2842257e-6fde-4460-9368-4cde57fa9cc4")] 25[assembly : Guid("2842257e-6fde-4460-9368-4cde57fa9cc4")]
26 26
27// Version information for an assembly consists of the following four values: 27// Version information for an assembly consists of the following four values:
28// 28//
29// Major Version 29// Major Version
30// Minor Version 30// Minor Version
31// Build Number 31// Build Number
32// Revision 32// Revision
33// 33//
34// You can specify all the values or you can default the Revision and Build Numbers 34// You can specify all the values or you can default the Revision and Build Numbers
35// by using the '*' as shown below: 35// by using the '*' as shown below:
36 36
37[assembly : AssemblyVersion("1.0.0.0")] 37[assembly : AssemblyVersion("1.0.0.0")]
38[assembly : AssemblyFileVersion("1.0.0.0")] \ No newline at end of file 38[assembly : AssemblyFileVersion("1.0.0.0")] \ No newline at end of file
diff --git a/OpenSim/Region/ScriptEngine/RemoteServer/RemoteServer.cs b/OpenSim/Region/ScriptEngine/RemoteServer/RemoteServer.cs
index e5db72d..3c88c41 100644
--- a/OpenSim/Region/ScriptEngine/RemoteServer/RemoteServer.cs
+++ b/OpenSim/Region/ScriptEngine/RemoteServer/RemoteServer.cs
@@ -1,58 +1,58 @@
1using System; 1using System;
2using System.Collections.Generic; 2using System.Collections.Generic;
3using System.Text; 3using System.Text;
4using System.Runtime.Remoting; 4using System.Runtime.Remoting;
5using System.Runtime.Remoting.Channels; 5using System.Runtime.Remoting.Channels;
6using System.Runtime.Remoting.Channels.Tcp; 6using System.Runtime.Remoting.Channels.Tcp;
7 7
8namespace OpenSim.Region.ScriptEngine.RemoteServer 8namespace OpenSim.Region.ScriptEngine.RemoteServer
9{ 9{
10 class RemoteServer 10 class RemoteServer
11 { 11 {
12 // Handles connections to servers 12 // Handles connections to servers
13 // Create and returns server object 13 // Create and returns server object
14 14
15 public OpenSim.Grid.ScriptServer.RemotingObject Connect(string hostname, int port) 15 public OpenSim.Grid.ScriptServer.RemotingObject Connect(string hostname, int port)
16 { 16 {
17 // Create a channel for communicating w/ the remote object 17 // Create a channel for communicating w/ the remote object
18 // Notice no port is specified on the client 18 // Notice no port is specified on the client
19 TcpChannel chan = new TcpChannel(); 19 TcpChannel chan = new TcpChannel();
20 try 20 try
21 { 21 {
22 ChannelServices.RegisterChannel(chan, true); 22 ChannelServices.RegisterChannel(chan, true);
23 } 23 }
24 catch (System.Runtime.Remoting.RemotingException) 24 catch (System.Runtime.Remoting.RemotingException)
25 { 25 {
26 System.Console.WriteLine("Error: tcp already registered, RemoteServer.cs in OpenSim.Region.ScriptEngine.RemoteServer line 24"); 26 System.Console.WriteLine("Error: tcp already registered, RemoteServer.cs in OpenSim.Region.ScriptEngine.RemoteServer line 24");
27 } 27 }
28 try 28 try
29 { 29 {
30 30
31 // Create an instance of the remote object 31 // Create an instance of the remote object
32 OpenSim.Grid.ScriptServer.RemotingObject obj = (OpenSim.Grid.ScriptServer.RemotingObject)Activator.GetObject( 32 OpenSim.Grid.ScriptServer.RemotingObject obj = (OpenSim.Grid.ScriptServer.RemotingObject)Activator.GetObject(
33 typeof(OpenSim.Grid.ScriptServer.RemotingObject), 33 typeof(OpenSim.Grid.ScriptServer.RemotingObject),
34 "tcp://" + hostname + ":" + port + "/DotNetEngine"); 34 "tcp://" + hostname + ":" + port + "/DotNetEngine");
35 35
36 // Use the object 36 // Use the object
37 if (obj.Equals(null)) 37 if (obj.Equals(null))
38 { 38 {
39 System.Console.WriteLine("Error: unable to locate server"); 39 System.Console.WriteLine("Error: unable to locate server");
40 } 40 }
41 else 41 else
42 { 42 {
43 return obj; 43 return obj;
44 } 44 }
45 } 45 }
46 catch (System.Net.Sockets.SocketException) 46 catch (System.Net.Sockets.SocketException)
47 { 47 {
48 System.Console.WriteLine("Error: unable to connect to server"); 48 System.Console.WriteLine("Error: unable to connect to server");
49 } 49 }
50 catch (System.Runtime.Remoting.RemotingException) 50 catch (System.Runtime.Remoting.RemotingException)
51 { 51 {
52 System.Console.WriteLine("Error: unable to connect to server"); 52 System.Console.WriteLine("Error: unable to connect to server");
53 } 53 }
54 return null; 54 return null;
55 55
56 } 56 }
57 } 57 }
58} 58}
diff --git a/OpenSim/Region/ScriptEngine/RemoteServer/ScriptEngine.cs b/OpenSim/Region/ScriptEngine/RemoteServer/ScriptEngine.cs
index 1853b65..9d3b989 100644
--- a/OpenSim/Region/ScriptEngine/RemoteServer/ScriptEngine.cs
+++ b/OpenSim/Region/ScriptEngine/RemoteServer/ScriptEngine.cs
@@ -1,106 +1,106 @@
1/* 1/*
2* Copyright (c) Contributors, http://opensimulator.org/ 2* Copyright (c) Contributors, http://opensimulator.org/
3* See CONTRIBUTORS.TXT for a full list of copyright holders. 3* See CONTRIBUTORS.TXT for a full list of copyright holders.
4* 4*
5* Redistribution and use in source and binary forms, with or without 5* Redistribution and use in source and binary forms, with or without
6* modification, are permitted provided that the following conditions are met: 6* modification, are permitted provided that the following conditions are met:
7* * Redistributions of source code must retain the above copyright 7* * Redistributions of source code must retain the above copyright
8* notice, this list of conditions and the following disclaimer. 8* notice, this list of conditions and the following disclaimer.
9* * Redistributions in binary form must reproduce the above copyright 9* * Redistributions in binary form must reproduce the above copyright
10* notice, this list of conditions and the following disclaimer in the 10* notice, this list of conditions and the following disclaimer in the
11* documentation and/or other materials provided with the distribution. 11* documentation and/or other materials provided with the distribution.
12* * Neither the name of the OpenSim Project nor the 12* * Neither the name of the OpenSim Project nor the
13* names of its contributors may be used to endorse or promote products 13* names of its contributors may be used to endorse or promote products
14* derived from this software without specific prior written permission. 14* derived from this software without specific prior written permission.
15* 15*
16* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY 16* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
17* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 17* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 18* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY 19* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 20* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 21* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 22* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 23* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 24* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26* 26*
27*/ 27*/
28/* Original code: Tedd Hansen */ 28/* Original code: Tedd Hansen */
29using System; 29using System;
30using Nini.Config; 30using Nini.Config;
31using OpenSim.Framework.Console; 31using OpenSim.Framework.Console;
32using OpenSim.Region.Environment.Interfaces; 32using OpenSim.Region.Environment.Interfaces;
33using OpenSim.Region.Environment.Scenes; 33using OpenSim.Region.Environment.Scenes;
34 34
35namespace OpenSim.Region.ScriptEngine.RemoteServer 35namespace OpenSim.Region.ScriptEngine.RemoteServer
36{ 36{
37 /// <summary> 37 /// <summary>
38 /// This is the root object for RemoteServer. Objects access each other trough this class. 38 /// This is the root object for RemoteServer. Objects access each other trough this class.
39 /// </summary> 39 /// </summary>
40 /// 40 ///
41 [Serializable] 41 [Serializable]
42 public class ScriptEngine : IRegionModule 42 public class ScriptEngine : IRegionModule
43 { 43 {
44 internal Scene World; 44 internal Scene World;
45 internal EventManager m_EventManager; // Handles and queues incoming events from OpenSim 45 internal EventManager m_EventManager; // Handles and queues incoming events from OpenSim
46 internal RemoteServer m_RemoteServer; // Handles connections to remote servers 46 internal RemoteServer m_RemoteServer; // Handles connections to remote servers
47 47
48 private LogBase m_log; 48 private LogBase m_log;
49 49
50 public ScriptEngine() 50 public ScriptEngine()
51 { 51 {
52 Common.mySE = this; 52 Common.mySE = this;
53 } 53 }
54 54
55 public LogBase Log 55 public LogBase Log
56 { 56 {
57 get { return m_log; } 57 get { return m_log; }
58 } 58 }
59 59
60 public void InitializeEngine(Scene Sceneworld, LogBase logger) 60 public void InitializeEngine(Scene Sceneworld, LogBase logger)
61 { 61 {
62 World = Sceneworld; 62 World = Sceneworld;
63 m_log = logger; 63 m_log = logger;
64 64
65 Log.Verbose("ScriptEngine", "RemoteEngine (Remote Script Server) initializing"); 65 Log.Verbose("ScriptEngine", "RemoteEngine (Remote Script Server) initializing");
66 // Create all objects we'll be using 66 // Create all objects we'll be using
67 m_EventManager = new EventManager(this); 67 m_EventManager = new EventManager(this);
68 m_RemoteServer = new RemoteServer(); 68 m_RemoteServer = new RemoteServer();
69 m_RemoteServer.Connect("localhost", 1234); 69 m_RemoteServer.Connect("localhost", 1234);
70 } 70 }
71 71
72 public void Shutdown() 72 public void Shutdown()
73 { 73 {
74 // We are shutting down 74 // We are shutting down
75 } 75 }
76 76
77 77
78 #region IRegionModule 78 #region IRegionModule
79 79
80 public void Initialise(Scene scene, IConfigSource config) 80 public void Initialise(Scene scene, IConfigSource config)
81 { 81 {
82 InitializeEngine(scene, MainLog.Instance); 82 InitializeEngine(scene, MainLog.Instance);
83 } 83 }
84 84
85 public void PostInitialise() 85 public void PostInitialise()
86 { 86 {
87 } 87 }
88 88
89 public void Close() 89 public void Close()
90 { 90 {
91 } 91 }
92 92
93 public string Name 93 public string Name
94 { 94 {
95 get { return "LSLScriptingModule"; } 95 get { return "LSLScriptingModule"; }
96 } 96 }
97 97
98 public bool IsSharedModule 98 public bool IsSharedModule
99 { 99 {
100 get { return false; } 100 get { return false; }
101 } 101 }
102 102
103 #endregion 103 #endregion
104 104
105 } 105 }
106} \ No newline at end of file 106} \ No newline at end of file
generated by cgit v1.1 at 2024-12-14 19:38:20 +0000