diff options
author | Jeff Ames | 2008-03-04 04:11:37 +0000 |
---|---|---|
committer | Jeff Ames | 2008-03-04 04:11:37 +0000 |
commit | cd6f4a57e7586ffd5c6dae91633e61e293272def (patch) | |
tree | 880c9199b13ae75e428c878f5857f9cef886cf73 /OpenSim/Grid | |
parent | think I finally fixed this hg sync issue (diff) | |
download | opensim-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')
6 files changed, 36 insertions, 12 deletions
diff --git a/OpenSim/Grid/MessagingServer/PresenceInformer.cs b/OpenSim/Grid/MessagingServer/PresenceInformer.cs index 877d104..e1c6d13 100644 --- a/OpenSim/Grid/MessagingServer/PresenceInformer.cs +++ b/OpenSim/Grid/MessagingServer/PresenceInformer.cs | |||
@@ -1,3 +1,30 @@ | |||
1 | /* | ||
2 | * Copyright (c) Contributors, http://opensimulator.org/ | ||
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | ||
4 | * | ||
5 | * Redistribution and use in source and binary forms, with or without | ||
6 | * modification, are permitted provided that the following conditions are met: | ||
7 | * * Redistributions of source code must retain the above copyright | ||
8 | * notice, this list of conditions and the following disclaimer. | ||
9 | * * Redistributions in binary form must reproduce the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer in the | ||
11 | * documentation and/or other materials provided with the distribution. | ||
12 | * * Neither the name of the OpenSim Project nor the | ||
13 | * names of its contributors may be used to endorse or promote products | ||
14 | * derived from this software without specific prior written permission. | ||
15 | * | ||
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY | ||
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | ||
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
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 | ||
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 | ||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
26 | */ | ||
27 | |||
1 | using System; | 28 | using System; |
2 | using System.Collections; | 29 | using System.Collections; |
3 | using System.Collections.Generic; | 30 | using System.Collections.Generic; |
diff --git a/OpenSim/Grid/ScriptEngine/Common/Properties/AssemblyInfo.cs b/OpenSim/Grid/ScriptEngine/Common/Properties/AssemblyInfo.cs index 79899f9..4917db3 100644 --- a/OpenSim/Grid/ScriptEngine/Common/Properties/AssemblyInfo.cs +++ b/OpenSim/Grid/ScriptEngine/Common/Properties/AssemblyInfo.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,7 @@ using System.Runtime.InteropServices; | |||
38 | [assembly : AssemblyConfiguration("")] | 38 | [assembly : AssemblyConfiguration("")] |
39 | [assembly : AssemblyCompany("")] | 39 | [assembly : AssemblyCompany("")] |
40 | [assembly : AssemblyProduct("OpenSim.Grid.ScriptEngine.Common")] | 40 | [assembly : AssemblyProduct("OpenSim.Grid.ScriptEngine.Common")] |
41 | [assembly : AssemblyCopyright("Copyright © 2007")] | 41 | [assembly : AssemblyCopyright("Copyright (c) 2007")] |
42 | [assembly : AssemblyTrademark("")] | 42 | [assembly : AssemblyTrademark("")] |
43 | [assembly : AssemblyCulture("")] | 43 | [assembly : AssemblyCulture("")] |
44 | 44 | ||
@@ -61,4 +61,4 @@ using System.Runtime.InteropServices; | |||
61 | // | 61 | // |
62 | 62 | ||
63 | [assembly : AssemblyVersion("1.0.0.0")] | 63 | [assembly : AssemblyVersion("1.0.0.0")] |
64 | [assembly : AssemblyFileVersion("1.0.0.0")] \ No newline at end of file | 64 | [assembly : AssemblyFileVersion("1.0.0.0")] |
diff --git a/OpenSim/Grid/ScriptEngine/DotNetEngine/Properties/AssemblyInfo.cs b/OpenSim/Grid/ScriptEngine/DotNetEngine/Properties/AssemblyInfo.cs index e53e9e5..ee7d1f2 100644 --- a/OpenSim/Grid/ScriptEngine/DotNetEngine/Properties/AssemblyInfo.cs +++ b/OpenSim/Grid/ScriptEngine/DotNetEngine/Properties/AssemblyInfo.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,7 @@ using System.Runtime.InteropServices; | |||
38 | [assembly : AssemblyConfiguration("")] | 38 | [assembly : AssemblyConfiguration("")] |
39 | [assembly : AssemblyCompany("")] | 39 | [assembly : AssemblyCompany("")] |
40 | [assembly : AssemblyProduct("OpenSim.Grid.ScriptEngine.DotNetEngine")] | 40 | [assembly : AssemblyProduct("OpenSim.Grid.ScriptEngine.DotNetEngine")] |
41 | [assembly : AssemblyCopyright("Copyright © 2007")] | 41 | [assembly : AssemblyCopyright("Copyright (c) 2007")] |
42 | [assembly : AssemblyTrademark("")] | 42 | [assembly : AssemblyTrademark("")] |
43 | [assembly : AssemblyCulture("")] | 43 | [assembly : AssemblyCulture("")] |
44 | 44 | ||
@@ -63,4 +63,4 @@ using System.Runtime.InteropServices; | |||
63 | // by using the '*' as shown below: | 63 | // by using the '*' as shown below: |
64 | 64 | ||
65 | [assembly : AssemblyVersion("1.0.0.0")] | 65 | [assembly : AssemblyVersion("1.0.0.0")] |
66 | [assembly : AssemblyFileVersion("1.0.0.0")] \ No newline at end of file | 66 | [assembly : AssemblyFileVersion("1.0.0.0")] |
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; | |||
34 | using System.Runtime.Remoting.Channels.Tcp; | 34 | using System.Runtime.Remoting.Channels.Tcp; |
35 | using OpenSim.Region.ScriptEngine.Common; | 35 | using OpenSim.Region.ScriptEngine.Common; |
36 | 36 | ||
37 | |||
38 | namespace OpenSim.Grid.ScriptServer | 37 | namespace 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 | } |