diff options
Renamed IUGAIMCore to IGridServiceCore, still not really happy with this name as it could be confused with the Grid Server namespace or with the IGridService in the region servers.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Grid/Framework/IGridServiceCore.cs (renamed from OpenSim/Grid/Framework/IUGAIMCore.cs) | 80 | ||||
-rw-r--r-- | OpenSim/Grid/Framework/IGridServiceModule.cs | 2 |
2 files changed, 41 insertions, 41 deletions
diff --git a/OpenSim/Grid/Framework/IUGAIMCore.cs b/OpenSim/Grid/Framework/IGridServiceCore.cs index 46fde8c..894ea14 100644 --- a/OpenSim/Grid/Framework/IUGAIMCore.cs +++ b/OpenSim/Grid/Framework/IGridServiceCore.cs | |||
@@ -1,40 +1,40 @@ | |||
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 | * |
5 | * Redistribution and use in source and binary forms, with or without | 5 | * Redistribution and use in source and binary forms, with or without |
6 | * modification, are permitted provided that the following conditions are met: | 6 | * modification, are permitted provided that the following conditions are met: |
7 | * * Redistributions of source code must retain the above copyright | 7 | * * Redistributions of source code must retain the above copyright |
8 | * notice, this list of conditions and the following disclaimer. | 8 | * notice, this list of conditions and the following disclaimer. |
9 | * * Redistributions in binary form must reproduce the above copyright | 9 | * * Redistributions in binary form must reproduce the above copyright |
10 | * notice, this list of conditions and the following disclaimer in the | 10 | * notice, this list of conditions and the following disclaimer in the |
11 | * documentation and/or other materials provided with the distribution. | 11 | * documentation and/or other materials provided with the distribution. |
12 | * * Neither the name of the OpenSimulator Project nor the | 12 | * * Neither the name of the OpenSimulator Project nor the |
13 | * names of its contributors may be used to endorse or promote products | 13 | * names of its contributors may be used to endorse or promote products |
14 | * derived from this software without specific prior written permission. | 14 | * derived from this software without specific prior written permission. |
15 | * | 15 | * |
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY | 16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY |
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | 17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED |
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | 18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE |
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | 19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY |
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | 20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES |
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | 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 | 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 | 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 | 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. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using OpenSim.Framework.Servers; | 29 | using OpenSim.Framework.Servers; |
30 | 30 | ||
31 | namespace OpenSim.Grid.Framework | 31 | namespace OpenSim.Grid.Framework |
32 | { | 32 | { |
33 | public interface IUGAIMCore | 33 | public interface IGridServiceCore |
34 | { | 34 | { |
35 | T Get<T>(); | 35 | T Get<T>(); |
36 | void RegisterInterface<T>(T iface); | 36 | void RegisterInterface<T>(T iface); |
37 | bool TryGet<T>(out T iface); | 37 | bool TryGet<T>(out T iface); |
38 | BaseHttpServer GetHttpServer(); | 38 | BaseHttpServer GetHttpServer(); |
39 | } | 39 | } |
40 | } | 40 | } |
diff --git a/OpenSim/Grid/Framework/IGridServiceModule.cs b/OpenSim/Grid/Framework/IGridServiceModule.cs index 6891beb..b44bd40 100644 --- a/OpenSim/Grid/Framework/IGridServiceModule.cs +++ b/OpenSim/Grid/Framework/IGridServiceModule.cs | |||
@@ -6,7 +6,7 @@ namespace OpenSim.Grid.Framework | |||
6 | public interface IGridServiceModule | 6 | public interface IGridServiceModule |
7 | { | 7 | { |
8 | void Close(); | 8 | void Close(); |
9 | void Initialise(IUGAIMCore core); | 9 | void Initialise(IGridServiceCore core); |
10 | void PostInitialise(); | 10 | void PostInitialise(); |
11 | void RegisterHandlers(BaseHttpServer httpServer); | 11 | void RegisterHandlers(BaseHttpServer httpServer); |
12 | } | 12 | } |