aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/RemoteServer/RemoteServer.cs
diff options
context:
space:
mode:
authorTedd Hansen2008-01-05 15:48:02 +0000
committerTedd Hansen2008-01-05 15:48:02 +0000
commit966f639ad6c83828d8e60ef9103ad61c360f9c3b (patch)
tree020ff9c0666d8e8980c920afd77e34660fc121f3 /OpenSim/Region/ScriptEngine/RemoteServer/RemoteServer.cs
parentAdded errorhandler+tip that grid server might not be running on grid registra... (diff)
downloadopensim-SC_OLD-966f639ad6c83828d8e60ef9103ad61c360f9c3b.zip
opensim-SC_OLD-966f639ad6c83828d8e60ef9103ad61c360f9c3b.tar.gz
opensim-SC_OLD-966f639ad6c83828d8e60ef9103ad61c360f9c3b.tar.bz2
opensim-SC_OLD-966f639ad6c83828d8e60ef9103ad61c360f9c3b.tar.xz
Changes to ScriptServer to (hopefully) make it compile on both .Net and Mono.
Some debug info for startup added to find bugs. ++
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/ScriptEngine/RemoteServer/RemoteServer.cs7
1 files changed, 4 insertions, 3 deletions
diff --git a/OpenSim/Region/ScriptEngine/RemoteServer/RemoteServer.cs b/OpenSim/Region/ScriptEngine/RemoteServer/RemoteServer.cs
index 3c88c41..6fc6c5c 100644
--- a/OpenSim/Region/ScriptEngine/RemoteServer/RemoteServer.cs
+++ b/OpenSim/Region/ScriptEngine/RemoteServer/RemoteServer.cs
@@ -4,6 +4,7 @@ using 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;
7using OpenSim.Region.ScriptEngine.Common;
7 8
8namespace OpenSim.Region.ScriptEngine.RemoteServer 9namespace OpenSim.Region.ScriptEngine.RemoteServer
9{ 10{
@@ -12,7 +13,7 @@ namespace OpenSim.Region.ScriptEngine.RemoteServer
12 // Handles connections to servers 13 // Handles connections to servers
13 // Create and returns server object 14 // Create and returns server object
14 15
15 public OpenSim.Grid.ScriptServer.RemotingObject Connect(string hostname, int port) 16 public ScriptServerInterfaces.ServerRemotingObject Connect(string hostname, int port)
16 { 17 {
17 // Create a channel for communicating w/ the remote object 18 // Create a channel for communicating w/ the remote object
18 // Notice no port is specified on the client 19 // Notice no port is specified on the client
@@ -29,8 +30,8 @@ namespace OpenSim.Region.ScriptEngine.RemoteServer
29 { 30 {
30 31
31 // Create an instance of the remote object 32 // Create an instance of the remote object
32 OpenSim.Grid.ScriptServer.RemotingObject obj = (OpenSim.Grid.ScriptServer.RemotingObject)Activator.GetObject( 33 ScriptServerInterfaces.ServerRemotingObject obj = (ScriptServerInterfaces.ServerRemotingObject)Activator.GetObject(
33 typeof(OpenSim.Grid.ScriptServer.RemotingObject), 34 typeof(ScriptServerInterfaces.ServerRemotingObject),
34 "tcp://" + hostname + ":" + port + "/DotNetEngine"); 35 "tcp://" + hostname + ":" + port + "/DotNetEngine");
35 36
36 // Use the object 37 // Use the object