diff options
author | Diva Canto | 2010-12-05 19:43:24 -0800 |
---|---|---|
committer | Diva Canto | 2010-12-05 19:43:24 -0800 |
commit | 72748746d53df1c033207452a4315d93bc780158 (patch) | |
tree | e50bf963b16737946c0717ee42779b2aa5e3ff8d /OpenSim/Services/HypergridService/GatekeeperService.cs | |
parent | Merge branch 'master-core' into mantis5110 (diff) | |
download | opensim-SC-72748746d53df1c033207452a4315d93bc780158.zip opensim-SC-72748746d53df1c033207452a4315d93bc780158.tar.gz opensim-SC-72748746d53df1c033207452a4315d93bc780158.tar.bz2 opensim-SC-72748746d53df1c033207452a4315d93bc780158.tar.xz |
Fixed some inconsistency with trailing /. Made debug messages consistent. Changed the stored region names of HG regions. Increased the size of regionName in DB.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Services/HypergridService/GatekeeperService.cs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/OpenSim/Services/HypergridService/GatekeeperService.cs b/OpenSim/Services/HypergridService/GatekeeperService.cs index 10e3aee..05be7b8 100644 --- a/OpenSim/Services/HypergridService/GatekeeperService.cs +++ b/OpenSim/Services/HypergridService/GatekeeperService.cs | |||
@@ -87,6 +87,8 @@ namespace OpenSim.Services.HypergridService | |||
87 | //m_WelcomeMessage = serverConfig.GetString("WelcomeMessage", "Welcome to OpenSim!"); | 87 | //m_WelcomeMessage = serverConfig.GetString("WelcomeMessage", "Welcome to OpenSim!"); |
88 | m_AllowTeleportsToAnyRegion = serverConfig.GetBoolean("AllowTeleportsToAnyRegion", true); | 88 | m_AllowTeleportsToAnyRegion = serverConfig.GetBoolean("AllowTeleportsToAnyRegion", true); |
89 | m_ExternalName = serverConfig.GetString("ExternalName", string.Empty); | 89 | m_ExternalName = serverConfig.GetString("ExternalName", string.Empty); |
90 | if (m_ExternalName != string.Empty && !m_ExternalName.EndsWith("/")) | ||
91 | m_ExternalName = m_ExternalName + "/"; | ||
90 | 92 | ||
91 | Object[] args = new Object[] { config }; | 93 | Object[] args = new Object[] { config }; |
92 | m_GridService = ServerUtils.LoadPlugin<IGridService>(gridService, args); | 94 | m_GridService = ServerUtils.LoadPlugin<IGridService>(gridService, args); |
@@ -118,7 +120,7 @@ namespace OpenSim.Services.HypergridService | |||
118 | { | 120 | { |
119 | regionID = UUID.Zero; | 121 | regionID = UUID.Zero; |
120 | regionHandle = 0; | 122 | regionHandle = 0; |
121 | externalName = m_ExternalName; | 123 | externalName = m_ExternalName + ((regionName != string.Empty) ? " " + regionName : ""); |
122 | imageURL = string.Empty; | 124 | imageURL = string.Empty; |
123 | reason = string.Empty; | 125 | reason = string.Empty; |
124 | 126 | ||