aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/HypergridService
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Services/HypergridService/GatekeeperService.cs5
1 files changed, 4 insertions, 1 deletions
diff --git a/OpenSim/Services/HypergridService/GatekeeperService.cs b/OpenSim/Services/HypergridService/GatekeeperService.cs
index 283ab3e..3cb5d50 100644
--- a/OpenSim/Services/HypergridService/GatekeeperService.cs
+++ b/OpenSim/Services/HypergridService/GatekeeperService.cs
@@ -59,6 +59,7 @@ namespace OpenSim.Services.HypergridService
59 59
60 UUID m_ScopeID; 60 UUID m_ScopeID;
61 bool m_AllowTeleportsToAnyRegion; 61 bool m_AllowTeleportsToAnyRegion;
62 string m_ExternalName;
62 GridRegion m_DefaultGatewayRegion; 63 GridRegion m_DefaultGatewayRegion;
63 64
64 public GatekeeperService(IConfigSource config, ISimulationService simService) 65 public GatekeeperService(IConfigSource config, ISimulationService simService)
@@ -83,6 +84,7 @@ namespace OpenSim.Services.HypergridService
83 UUID.TryParse(scope, out m_ScopeID); 84 UUID.TryParse(scope, out m_ScopeID);
84 //m_WelcomeMessage = serverConfig.GetString("WelcomeMessage", "Welcome to OpenSim!"); 85 //m_WelcomeMessage = serverConfig.GetString("WelcomeMessage", "Welcome to OpenSim!");
85 m_AllowTeleportsToAnyRegion = serverConfig.GetBoolean("AllowTeleportsToAnyRegion", true); 86 m_AllowTeleportsToAnyRegion = serverConfig.GetBoolean("AllowTeleportsToAnyRegion", true);
87 m_ExternalName = serverConfig.GetString("ExternalName", string.Empty);
86 88
87 Object[] args = new Object[] { config }; 89 Object[] args = new Object[] { config };
88 m_GridService = ServerUtils.LoadPlugin<IGridService>(gridService, args); 90 m_GridService = ServerUtils.LoadPlugin<IGridService>(gridService, args);
@@ -109,10 +111,11 @@ namespace OpenSim.Services.HypergridService
109 { 111 {
110 } 112 }
111 113
112 public bool LinkRegion(string regionName, out UUID regionID, out ulong regionHandle, out string imageURL, out string reason) 114 public bool LinkRegion(string regionName, out UUID regionID, out ulong regionHandle, out string externalName, out string imageURL, out string reason)
113 { 115 {
114 regionID = UUID.Zero; 116 regionID = UUID.Zero;
115 regionHandle = 0; 117 regionHandle = 0;
118 externalName = m_ExternalName;
116 imageURL = string.Empty; 119 imageURL = string.Empty;
117 reason = string.Empty; 120 reason = string.Empty;
118 121