1 files changed, 25 insertions, 11 deletions

diff --git a/OpenSim/Region/ScriptEngine/RemoteServer/RemoteServer.cs b/OpenSim/Region/ScriptEngine/RemoteServer/RemoteServer.cs
index 1a528c8..4fff20d 100644
--- a/OpenSim/Region/ScriptEngine/RemoteServer/RemoteServer.cs
+++ b/OpenSim/Region/ScriptEngine/RemoteServer/RemoteServer.cs
@@ -17,21 +17,35 @@ namespace OpenSim.Region.ScriptEngine.RemoteServer
             // Create a channel for communicating w/ the remote object

             // Notice no port is specified on the client

             TcpChannel chan = new TcpChannel();

-            ChannelServices.RegisterChannel(chan, true);

+            try

+            {

+                ChannelServices.RegisterChannel(chan, true);

+            }

+            catch (System.Runtime.Remoting.RemotingException)

+            {

+                System.Console.WriteLine("Error: tcp already registered, RemoteServer.cs in OpenSim.Region.ScriptEngine.RemoteServer line 24");

+            }

+            try

+            {

 

-            // Create an instance of the remote object

-            OpenSim.Grid.ScriptServer.RemotingObject obj = (OpenSim.Grid.ScriptServer.RemotingObject)Activator.GetObject(

-                typeof(OpenSim.Grid.ScriptServer.RemotingObject),

-                "tcp://" + hostname + ":" + port + "/DotNetEngine");

+                // Create an instance of the remote object

+                OpenSim.Grid.ScriptServer.RemotingObject obj = (OpenSim.Grid.ScriptServer.RemotingObject)Activator.GetObject(

+                    typeof(OpenSim.Grid.ScriptServer.RemotingObject),

+                    "tcp://" + hostname + ":" + port + "/DotNetEngine");

 

-            // Use the object

-            if (obj.Equals(null))

-            {

-                System.Console.WriteLine("Error: unable to locate server");

+                // Use the object

+                if (obj.Equals(null))

+                {

+                    System.Console.WriteLine("Error: unable to locate server");

+                }

+                else

+                {

+                    return obj;

+                }

             }

-            else

+            catch (System.Net.Sockets.SocketException)

             {

-                return obj;

+                System.Console.WriteLine("Error: unable to connect to server");

             }

             return null;