aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Grid/ScriptServer
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/Grid/ScriptServer
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 '')
-rw-r--r--OpenSim/Grid/ScriptServer/RemotingObject.cs50
-rw-r--r--OpenSim/Grid/ScriptServer/RemotingServer.cs56
2 files changed, 53 insertions, 53 deletions
diff --git a/OpenSim/Grid/ScriptServer/RemotingObject.cs b/OpenSim/Grid/ScriptServer/RemotingObject.cs
index 4c5a176..2a235bf 100644
--- a/OpenSim/Grid/ScriptServer/RemotingObject.cs
+++ b/OpenSim/Grid/ScriptServer/RemotingObject.cs
@@ -1,25 +1,25 @@
1using System; 1using System;
2using System.Collections.Generic; 2using System.Collections.Generic;
3using System.Text; 3using System.Text;
4using OpenSim.Region.Environment.Interfaces; 4using OpenSim.Region.Environment.Interfaces;
5 5
6namespace OpenSim.Grid.ScriptServer 6namespace OpenSim.Grid.ScriptServer
7{ 7{
8 public class RemotingObject : MarshalByRefObject 8 public class RemotingObject : MarshalByRefObject
9 { 9 {
10 // This object will be exposed over remoting. It is a singleton, so it exists only in as one instance. 10 // This object will be exposed over remoting. It is a singleton, so it exists only in as one instance.
11 11
12 // Expose ScriptEngine directly for now ... this is not very secure :) 12 // Expose ScriptEngine directly for now ... this is not very secure :)
13 // NOTE! CURRENTLY JUST HARDWIRED DOTNETENGINE! 13 // NOTE! CURRENTLY JUST HARDWIRED DOTNETENGINE!
14 public OpenSim.Region.ScriptEngine.DotNetEngine.ScriptEngine ScriptEngine = new OpenSim.Region.ScriptEngine.DotNetEngine.ScriptEngine(); 14 public OpenSim.Region.ScriptEngine.DotNetEngine.ScriptEngine ScriptEngine = new OpenSim.Region.ScriptEngine.DotNetEngine.ScriptEngine();
15 15
16 /// <summary> 16 /// <summary>
17 /// Receives calls from remote grids. 17 /// Receives calls from remote grids.
18 /// </summary> 18 /// </summary>
19 /// <returns></returns> 19 /// <returns></returns>
20 public OpenSim.Region.ScriptEngine.DotNetEngine.ScriptEngine GetScriptEngine() 20 public OpenSim.Region.ScriptEngine.DotNetEngine.ScriptEngine GetScriptEngine()
21 { 21 {
22 return ScriptEngine; 22 return ScriptEngine;
23 } 23 }
24 } 24 }
25} 25}
diff --git a/OpenSim/Grid/ScriptServer/RemotingServer.cs b/OpenSim/Grid/ScriptServer/RemotingServer.cs
index 3ec3e64..33d8dc8 100644
--- a/OpenSim/Grid/ScriptServer/RemotingServer.cs
+++ b/OpenSim/Grid/ScriptServer/RemotingServer.cs
@@ -1,28 +1,28 @@
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
8 8
9namespace OpenSim.Grid.ScriptServer 9namespace OpenSim.Grid.ScriptServer
10{ 10{
11 class RemotingServer 11 class RemotingServer
12 { 12 {
13 13
14 public void CreateServer(int port, string instanceName) 14 public void CreateServer(int port, string instanceName)
15 { 15 {
16 // Create an instance of a channel 16 // Create an instance of a channel
17 TcpChannel channel = new TcpChannel(port); 17 TcpChannel channel = new TcpChannel(port);
18 ChannelServices.RegisterChannel(channel, true); 18 ChannelServices.RegisterChannel(channel, true);
19 19
20 // Register as an available service with the name HelloWorld 20 // Register as an available service with the name HelloWorld
21 RemotingConfiguration.RegisterWellKnownServiceType( 21 RemotingConfiguration.RegisterWellKnownServiceType(
22 typeof(RemotingObject), 22 typeof(RemotingObject),
23 instanceName, 23 instanceName,
24 WellKnownObjectMode.Singleton); 24 WellKnownObjectMode.Singleton);
25 25
26 } 26 }
27 } 27 }
28} 28}