aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Grid/ScriptServer
diff options
context:
space:
mode:
authorJeff Ames2008-03-04 04:11:37 +0000
committerJeff Ames2008-03-04 04:11:37 +0000
commitcd6f4a57e7586ffd5c6dae91633e61e293272def (patch)
tree880c9199b13ae75e428c878f5857f9cef886cf73 /OpenSim/Grid/ScriptServer
parentthink I finally fixed this hg sync issue (diff)
downloadopensim-SC_OLD-cd6f4a57e7586ffd5c6dae91633e61e293272def.zip
opensim-SC_OLD-cd6f4a57e7586ffd5c6dae91633e61e293272def.tar.gz
opensim-SC_OLD-cd6f4a57e7586ffd5c6dae91633e61e293272def.tar.bz2
opensim-SC_OLD-cd6f4a57e7586ffd5c6dae91633e61e293272def.tar.xz
Added copyright heaaders. Minor cleanup.
Diffstat (limited to 'OpenSim/Grid/ScriptServer')
-rw-r--r--OpenSim/Grid/ScriptServer/FakeScene.cs2
-rw-r--r--OpenSim/Grid/ScriptServer/RemotingObject.cs3
-rw-r--r--OpenSim/Grid/ScriptServer/RemotingServer.cs4
3 files changed, 3 insertions, 6 deletions
diff --git a/OpenSim/Grid/ScriptServer/FakeScene.cs b/OpenSim/Grid/ScriptServer/FakeScene.cs
index 6c10489..e4fdd28 100644
--- a/OpenSim/Grid/ScriptServer/FakeScene.cs
+++ b/OpenSim/Grid/ScriptServer/FakeScene.cs
@@ -1,4 +1,4 @@
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*
diff --git a/OpenSim/Grid/ScriptServer/RemotingObject.cs b/OpenSim/Grid/ScriptServer/RemotingObject.cs
index c9d102b..412855e 100644
--- a/OpenSim/Grid/ScriptServer/RemotingObject.cs
+++ b/OpenSim/Grid/ScriptServer/RemotingObject.cs
@@ -1,4 +1,4 @@
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*
@@ -38,7 +38,6 @@ namespace OpenSim.Grid.ScriptServer
38 { 38 {
39 // This object will be exposed over remoting. It is a singleton, so it exists only in as one instance. 39 // This object will be exposed over remoting. It is a singleton, so it exists only in as one instance.
40 40
41
42 ScriptServerInterfaces.RemoteEvents ScriptServerInterfaces.ServerRemotingObject.Events() 41 ScriptServerInterfaces.RemoteEvents ScriptServerInterfaces.ServerRemotingObject.Events()
43 { 42 {
44 return ScriptServerMain.Engine.EventManager(); 43 return ScriptServerMain.Engine.EventManager();
diff --git a/OpenSim/Grid/ScriptServer/RemotingServer.cs b/OpenSim/Grid/ScriptServer/RemotingServer.cs
index f680f92..f2c3cd4 100644
--- a/OpenSim/Grid/ScriptServer/RemotingServer.cs
+++ b/OpenSim/Grid/ScriptServer/RemotingServer.cs
@@ -1,4 +1,4 @@
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*
@@ -34,7 +34,6 @@ using System.Runtime.Remoting.Channels;
34using System.Runtime.Remoting.Channels.Tcp; 34using System.Runtime.Remoting.Channels.Tcp;
35using OpenSim.Region.ScriptEngine.Common; 35using OpenSim.Region.ScriptEngine.Common;
36 36
37
38namespace OpenSim.Grid.ScriptServer 37namespace OpenSim.Grid.ScriptServer
39{ 38{
40 class RemotingServer 39 class RemotingServer
@@ -51,7 +50,6 @@ namespace OpenSim.Grid.ScriptServer
51 typeof(RemotingObject), 50 typeof(RemotingObject),
52 instanceName, 51 instanceName,
53 WellKnownObjectMode.Singleton); 52 WellKnownObjectMode.Singleton);
54
55 } 53 }
56 } 54 }
57} 55}