aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Communications/OGS1
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Communications/OGS1')
-rw-r--r--OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs6
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1GridServices.cs15
2 files changed, 17 insertions, 4 deletions
diff --git a/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs b/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs
index 1926e79..d76f076 100644
--- a/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs
+++ b/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs
@@ -34,8 +34,10 @@ namespace OpenSim.Region.Communications.OGS1
34{ 34{
35 public class CommunicationsOGS1 : CommunicationsManager 35 public class CommunicationsOGS1 : CommunicationsManager
36 { 36 {
37 public CommunicationsOGS1(NetworkServersInfo serversInfo, BaseHttpServer httpServer, AssetCache assetCache) 37 public CommunicationsOGS1(
38 : base(serversInfo, httpServer, assetCache, false) 38 NetworkServersInfo serversInfo, BaseHttpServer httpServer,
39 AssetCache assetCache, LibraryRootFolder libraryRootFolder)
40 : base(serversInfo, httpServer, assetCache, false, libraryRootFolder)
39 { 41 {
40 OGS1GridServices gridInterComms = new OGS1GridServices(serversInfo, httpServer); 42 OGS1GridServices gridInterComms = new OGS1GridServices(serversInfo, httpServer);
41 m_gridService = gridInterComms; 43 m_gridService = gridInterComms;
diff --git a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
index 3bd57cd..2e91157 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
@@ -51,15 +51,16 @@ namespace OpenSim.Region.Communications.OGS1
51 { 51 {
52 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 52 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
53 53
54 // FIXME: LocalBackEndServices should to be refactored into a separate common parent class rather than
55 // encapsulated.
54 private LocalBackEndServices m_localBackend = new LocalBackEndServices(); 56 private LocalBackEndServices m_localBackend = new LocalBackEndServices();
57
55 private Dictionary<ulong, RegionInfo> m_remoteRegionInfoCache = new Dictionary<ulong, RegionInfo>(); 58 private Dictionary<ulong, RegionInfo> m_remoteRegionInfoCache = new Dictionary<ulong, RegionInfo>();
56 // private List<SimpleRegionInfo> m_knownRegions = new List<SimpleRegionInfo>(); 59 // private List<SimpleRegionInfo> m_knownRegions = new List<SimpleRegionInfo>();
57 private Dictionary<ulong, int> m_deadRegionCache = new Dictionary<ulong, int>(); 60 private Dictionary<ulong, int> m_deadRegionCache = new Dictionary<ulong, int>();
58 private Dictionary<string, string> m_queuedGridSettings = new Dictionary<string, string>(); 61 private Dictionary<string, string> m_queuedGridSettings = new Dictionary<string, string>();
59 private List<RegionInfo> m_regionsOnInstance = new List<RegionInfo>(); 62 private List<RegionInfo> m_regionsOnInstance = new List<RegionInfo>();
60 63
61
62
63 public BaseHttpServer httpListener; 64 public BaseHttpServer httpListener;
64 public NetworkServersInfo serversInfo; 65 public NetworkServersInfo serversInfo;
65 public BaseHttpServer httpServer; 66 public BaseHttpServer httpServer;
@@ -79,6 +80,16 @@ namespace OpenSim.Region.Communications.OGS1
79 get { return _rdebugRegionName; } 80 get { return _rdebugRegionName; }
80 set { _rdebugRegionName = value; } 81 set { _rdebugRegionName = value; }
81 } 82 }
83
84 /// <summary>
85 /// Doesn't have any effect yet!
86 /// </summary>
87 public bool RegionLoginsEnabled
88 {
89 get { return m_regionLoginsEnabled; }
90 set { m_regionLoginsEnabled = value; }
91 }
92 private bool m_regionLoginsEnabled;
82 93
83 /// <summary> 94 /// <summary>
84 /// Contructor. Adds "expect_user" and "check" xmlrpc method handlers 95 /// Contructor. Adds "expect_user" and "check" xmlrpc method handlers