aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authordiva2008-12-31 00:49:34 +0000
committerdiva2008-12-31 00:49:34 +0000
commit12946b5d788d8ca699f9b74240e1189f3cdbd3c6 (patch)
treec0ffc2aaf5e9cebcc0924028077e3d65f60ac044
parentAdded a SendChildAgentDataUpdate call on Teleports, so that the agent at the ... (diff)
downloadopensim-SC_OLD-12946b5d788d8ca699f9b74240e1189f3cdbd3c6.zip
opensim-SC_OLD-12946b5d788d8ca699f9b74240e1189f3cdbd3c6.tar.gz
opensim-SC_OLD-12946b5d788d8ca699f9b74240e1189f3cdbd3c6.tar.bz2
opensim-SC_OLD-12946b5d788d8ca699f9b74240e1189f3cdbd3c6.tar.xz
Folded HG regionhandle lookup into the normal RESTInterregionComms, to avoid proliferation of "modes".
-rw-r--r--OpenSim/Region/Environment/Modules/Communications/REST/HGInterregionComms.cs87
-rw-r--r--OpenSim/Region/Environment/Modules/Communications/REST/RESTInterregionComms.cs4
-rw-r--r--bin/OpenSim.ini.example1
3 files changed, 4 insertions, 88 deletions
diff --git a/OpenSim/Region/Environment/Modules/Communications/REST/HGInterregionComms.cs b/OpenSim/Region/Environment/Modules/Communications/REST/HGInterregionComms.cs
deleted file mode 100644
index 1599d75..0000000
--- a/OpenSim/Region/Environment/Modules/Communications/REST/HGInterregionComms.cs
+++ /dev/null
@@ -1,87 +0,0 @@
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 */
27using System;
28using System.Collections;
29using System.Collections.Generic;
30using System.Reflection;
31using log4net;
32using Nini.Config;
33using OpenSim.Framework;
34using OpenSim.Framework.Communications;
35using OpenSim.Framework.Communications.Cache;
36using OpenSim.Region.Environment.Interfaces;
37using OpenSim.Region.Interfaces;
38using OpenSim.Region.Environment.Scenes;
39using OpenSim.Region.Environment.Scenes.Hypergrid;
40
41namespace OpenSim.Region.Environment.Modules.Communications.REST
42{
43 public class HGInterregionComms : RESTInterregionComms
44 {
45 private static bool initialized = false;
46 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
47
48 #region IRegionModule
49
50 public override void Initialise(Scene scene, IConfigSource config)
51 {
52 if (!initialized)
53 {
54 initialized = true;
55 IConfig startupConfig = config.Configs["Communications"];
56 if ((startupConfig != null) && (startupConfig.GetString("InterregionComms", "RESTCommms") == "HGRESTComms"))
57 {
58 m_log.Debug("[HGREST COMMS]: Enabling InterregionComms HGRESTComms module");
59 m_enabled = true;
60 InitOnce(scene);
61 }
62 }
63
64 if (!m_enabled)
65 return;
66
67 InitEach(scene);
68 }
69
70 public override string Name
71 {
72 get { return "HGInterregionCommsModule"; }
73 }
74
75 #endregion /* IRegionModule */
76
77 #region Misc
78
79 protected override ulong GetRegionHandle(RegionInfo region)
80 {
81 return ((HGSceneCommunicationService)(m_aScene.SceneGridService)).m_hg.FindRegionHandle(region.RegionHandle);
82 }
83
84 #endregion /* Misc */
85
86 }
87}
diff --git a/OpenSim/Region/Environment/Modules/Communications/REST/RESTInterregionComms.cs b/OpenSim/Region/Environment/Modules/Communications/REST/RESTInterregionComms.cs
index 92c9463..255c185 100644
--- a/OpenSim/Region/Environment/Modules/Communications/REST/RESTInterregionComms.cs
+++ b/OpenSim/Region/Environment/Modules/Communications/REST/RESTInterregionComms.cs
@@ -44,6 +44,7 @@ using OpenSim.Framework.Communications.Cache;
44using OpenSim.Region.Environment.Interfaces; 44using OpenSim.Region.Environment.Interfaces;
45using OpenSim.Region.Interfaces; 45using OpenSim.Region.Interfaces;
46using OpenSim.Region.Environment.Scenes; 46using OpenSim.Region.Environment.Scenes;
47using OpenSim.Region.Environment.Scenes.Hypergrid;
47using OpenSim.Region.Environment.Modules.Communications.Local; 48using OpenSim.Region.Environment.Modules.Communications.Local;
48 49
49namespace OpenSim.Region.Environment.Modules.Communications.REST 50namespace OpenSim.Region.Environment.Modules.Communications.REST
@@ -291,6 +292,9 @@ namespace OpenSim.Region.Environment.Modules.Communications.REST
291 292
292 protected virtual ulong GetRegionHandle(RegionInfo region) 293 protected virtual ulong GetRegionHandle(RegionInfo region)
293 { 294 {
295 if (m_aScene.SceneGridService is HGSceneCommunicationService)
296 return ((HGSceneCommunicationService)(m_aScene.SceneGridService)).m_hg.FindRegionHandle(region.RegionHandle);
297
294 return region.RegionHandle; 298 return region.RegionHandle;
295 } 299 }
296 300
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 6c30f6e..c5caf78 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -183,7 +183,6 @@
183 183
184;InterregionComms = "LocalComms" 184;InterregionComms = "LocalComms"
185InterregionComms = "RESTComms" 185InterregionComms = "RESTComms"
186;InterregionComms = "HGRESTComms"
187 186
188[StandAlone] 187[StandAlone]
189 accounts_authenticate = true 188 accounts_authenticate = true