diff options
author | Diva Canto | 2013-02-21 17:26:19 -0800 |
---|---|---|
committer | Diva Canto | 2013-02-21 17:26:19 -0800 |
commit | e515cdddec435e97e9ed4722de08ee410e94a7e6 (patch) | |
tree | 0b090dc495ef464e037d4f134f059bce35504d2f | |
parent | BulletSim: add OutOfBounds logic and some position sanity checking (diff) | |
download | opensim-SC-e515cdddec435e97e9ed4722de08ee410e94a7e6.zip opensim-SC-e515cdddec435e97e9ed4722de08ee410e94a7e6.tar.gz opensim-SC-e515cdddec435e97e9ed4722de08ee410e94a7e6.tar.bz2 opensim-SC-e515cdddec435e97e9ed4722de08ee410e94a7e6.tar.xz |
Simplification of HG configs: HomeURI and GatekeeperURI now are defined as default under [Startup]. They can then be overwritten in the other sections (but probably shouldn't). I kept the existing code for backwards compatibility, so this should not cause any breaks from people's current configurations. But people should move to have these 2 vars under [Startup] -- see OpenSim.ini.example and Robust.HG.ini.example. And yes, both names now end with "URI" for consistency.
Diffstat (limited to '')
16 files changed, 153 insertions, 67 deletions
diff --git a/OpenSim/Addons/Groups/Hypergrid/HGGroupsServiceRobustConnector.cs b/OpenSim/Addons/Groups/Hypergrid/HGGroupsServiceRobustConnector.cs index 92dd85c..0e71c72 100644 --- a/OpenSim/Addons/Groups/Hypergrid/HGGroupsServiceRobustConnector.cs +++ b/OpenSim/Addons/Groups/Hypergrid/HGGroupsServiceRobustConnector.cs | |||
@@ -65,14 +65,14 @@ namespace OpenSim.Groups | |||
65 | 65 | ||
66 | m_log.DebugFormat("[Groups.RobustHGConnector]: Starting with config name {0}", m_ConfigName); | 66 | m_log.DebugFormat("[Groups.RobustHGConnector]: Starting with config name {0}", m_ConfigName); |
67 | 67 | ||
68 | string homeURI = Util.GetConfigVarWithDefaultSection(config, "HomeURI", m_ConfigName); //cnf.GetString("HomeURI", string.Empty); | ||
69 | if (homeURI == string.Empty) | ||
70 | throw new Exception(String.Format("[Groups.RobustHGConnector]: please provide the HomeURI [Startup] or in section {0}", m_ConfigName)); | ||
71 | |||
68 | IConfig cnf = config.Configs[m_ConfigName]; | 72 | IConfig cnf = config.Configs[m_ConfigName]; |
69 | if (cnf == null) | 73 | if (cnf == null) |
70 | throw new Exception(String.Format("[Groups.RobustHGConnector]: {0} section does not exist", m_ConfigName)); | 74 | throw new Exception(String.Format("[Groups.RobustHGConnector]: {0} section does not exist", m_ConfigName)); |
71 | 75 | ||
72 | string homeURI = cnf.GetString("HomeURI", string.Empty); | ||
73 | if (homeURI == string.Empty) | ||
74 | throw new Exception(String.Format("[Groups.RobustHGConnector]: please provide the HomeURI in section {0}", m_ConfigName)); | ||
75 | |||
76 | if (im == null) | 76 | if (im == null) |
77 | { | 77 | { |
78 | string imDll = cnf.GetString("OfflineIMService", string.Empty); | 78 | string imDll = cnf.GetString("OfflineIMService", string.Empty); |
diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs index d9148fb..1700d3e 100644 --- a/OpenSim/Framework/Util.cs +++ b/OpenSim/Framework/Util.cs | |||
@@ -863,7 +863,7 @@ namespace OpenSim.Framework | |||
863 | return FileName; | 863 | return FileName; |
864 | } | 864 | } |
865 | 865 | ||
866 | // Nini (config) related Methods | 866 | #region Nini (config) related Methods |
867 | public static IConfigSource ConvertDataRowToXMLConfig(DataRow row, string fileName) | 867 | public static IConfigSource ConvertDataRowToXMLConfig(DataRow row, string fileName) |
868 | { | 868 | { |
869 | if (!File.Exists(fileName)) | 869 | if (!File.Exists(fileName)) |
@@ -886,6 +886,26 @@ namespace OpenSim.Framework | |||
886 | } | 886 | } |
887 | } | 887 | } |
888 | 888 | ||
889 | public static string GetConfigVarWithDefaultSection(IConfigSource config, string varname, string section) | ||
890 | { | ||
891 | // First, check the Startup section, the default section | ||
892 | IConfig cnf = config.Configs["Startup"]; | ||
893 | if (cnf == null) | ||
894 | return string.Empty; | ||
895 | string val = cnf.GetString(varname, string.Empty); | ||
896 | |||
897 | // Then check for an overwrite of the default in the given section | ||
898 | if (!string.IsNullOrEmpty(section)) | ||
899 | { | ||
900 | cnf = config.Configs[section]; | ||
901 | if (cnf != null) | ||
902 | val = cnf.GetString(varname, val); | ||
903 | } | ||
904 | |||
905 | return val; | ||
906 | } | ||
907 | #endregion | ||
908 | |||
889 | public static float Clip(float x, float min, float max) | 909 | public static float Clip(float x, float min, float max) |
890 | { | 910 | { |
891 | return Math.Min(Math.Max(x, min), max); | 911 | return Math.Min(Math.Max(x, min), max); |
diff --git a/OpenSim/Region/CoreModules/Avatar/Lure/HGLureModule.cs b/OpenSim/Region/CoreModules/Avatar/Lure/HGLureModule.cs index 232a4fe..784a788 100644 --- a/OpenSim/Region/CoreModules/Avatar/Lure/HGLureModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Lure/HGLureModule.cs | |||
@@ -65,7 +65,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Lure | |||
65 | { | 65 | { |
66 | m_Enabled = true; | 66 | m_Enabled = true; |
67 | 67 | ||
68 | m_ThisGridURL = config.Configs["Messaging"].GetString("Gatekeeper", string.Empty); | 68 | m_ThisGridURL = Util.GetConfigVarWithDefaultSection(config, "GatekeeperURI", "Messaging"); |
69 | // Legacy. Remove soon! | ||
70 | m_ThisGridURL = config.Configs["Messaging"].GetString("Gatekeeper", m_ThisGridURL); | ||
69 | m_log.DebugFormat("[LURE MODULE]: {0} enabled", Name); | 71 | m_log.DebugFormat("[LURE MODULE]: {0} enabled", Name); |
70 | } | 72 | } |
71 | } | 73 | } |
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs index 964efda..c439ea8 100644 --- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs +++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs | |||
@@ -88,12 +88,11 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess | |||
88 | IConfig thisModuleConfig = source.Configs["HGInventoryAccessModule"]; | 88 | IConfig thisModuleConfig = source.Configs["HGInventoryAccessModule"]; |
89 | if (thisModuleConfig != null) | 89 | if (thisModuleConfig != null) |
90 | { | 90 | { |
91 | // legacy configuration [obsolete] | 91 | m_HomeURI = Util.GetConfigVarWithDefaultSection(source, "HomeURI", "HGInventoryAccessModule"); |
92 | m_HomeURI = thisModuleConfig.GetString("ProfileServerURI", string.Empty); | ||
93 | // preferred | ||
94 | m_HomeURI = thisModuleConfig.GetString("HomeURI", m_HomeURI); | ||
95 | m_OutboundPermission = thisModuleConfig.GetBoolean("OutboundPermission", true); | 92 | m_OutboundPermission = thisModuleConfig.GetBoolean("OutboundPermission", true); |
96 | m_ThisGatekeeper = thisModuleConfig.GetString("Gatekeeper", string.Empty); | 93 | m_ThisGatekeeper = Util.GetConfigVarWithDefaultSection(source, "GatekeeperURI", "HGInventoryAccessModule"); |
94 | // Legacy. Renove soon! | ||
95 | m_ThisGatekeeper = thisModuleConfig.GetString("Gatekeeper", m_ThisGatekeeper); | ||
97 | m_RestrictInventoryAccessAbroad = thisModuleConfig.GetBoolean("RestrictInventoryAccessAbroad", true); | 96 | m_RestrictInventoryAccessAbroad = thisModuleConfig.GetBoolean("RestrictInventoryAccessAbroad", true); |
98 | } | 97 | } |
99 | else | 98 | else |
diff --git a/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs b/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs index 5e62f23..13d9d31 100644 --- a/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs +++ b/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs | |||
@@ -113,9 +113,16 @@ namespace OpenSim.Region.DataSnapshot | |||
113 | try | 113 | try |
114 | { | 114 | { |
115 | m_enabled = config.Configs["DataSnapshot"].GetBoolean("index_sims", m_enabled); | 115 | m_enabled = config.Configs["DataSnapshot"].GetBoolean("index_sims", m_enabled); |
116 | IConfig conf = config.Configs["GridService"]; | 116 | string gatekeeper = Util.GetConfigVarWithDefaultSection(config, "GatekeeperURI", "GridService"); |
117 | if (conf != null) | 117 | // Legacy. Remove soon! |
118 | m_gridinfo.Add("gatekeeperURL", conf.GetString("Gatekeeper", String.Empty)); | 118 | if (string.IsNullOrEmpty(gatekeeper)) |
119 | { | ||
120 | IConfig conf = config.Configs["GridService"]; | ||
121 | if (conf != null) | ||
122 | gatekeeper = conf.GetString("Gatekeeper", gatekeeper); | ||
123 | } | ||
124 | if (!string.IsNullOrEmpty(gatekeeper)) | ||
125 | m_gridinfo.Add("gatekeeperURL", gatekeeper); | ||
119 | 126 | ||
120 | m_gridinfo.Add( | 127 | m_gridinfo.Add( |
121 | "name", config.Configs["DataSnapshot"].GetString("gridname", "the lost continent of hippo")); | 128 | "name", config.Configs["DataSnapshot"].GetString("gridname", "the lost continent of hippo")); |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs index 1426070..0334169 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | |||
@@ -2137,9 +2137,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
2137 | CheckThreatLevel(ThreatLevel.Moderate, "osGetGridHomeURI"); | 2137 | CheckThreatLevel(ThreatLevel.Moderate, "osGetGridHomeURI"); |
2138 | m_host.AddScriptLPS(1); | 2138 | m_host.AddScriptLPS(1); |
2139 | 2139 | ||
2140 | string HomeURI = String.Empty; | ||
2141 | IConfigSource config = m_ScriptEngine.ConfigSource; | 2140 | IConfigSource config = m_ScriptEngine.ConfigSource; |
2141 | string HomeURI = Util.GetConfigVarWithDefaultSection(config, "HomeURI", string.Empty); | ||
2142 | 2142 | ||
2143 | if (!string.IsNullOrEmpty(HomeURI)) | ||
2144 | return HomeURI; | ||
2145 | |||
2146 | // Legacy. Remove soon! | ||
2143 | if (config.Configs["LoginService"] != null) | 2147 | if (config.Configs["LoginService"] != null) |
2144 | HomeURI = config.Configs["LoginService"].GetString("SRV_HomeURI", HomeURI); | 2148 | HomeURI = config.Configs["LoginService"].GetString("SRV_HomeURI", HomeURI); |
2145 | 2149 | ||
@@ -2154,9 +2158,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
2154 | CheckThreatLevel(ThreatLevel.Moderate, "osGetGridGatekeeperURI"); | 2158 | CheckThreatLevel(ThreatLevel.Moderate, "osGetGridGatekeeperURI"); |
2155 | m_host.AddScriptLPS(1); | 2159 | m_host.AddScriptLPS(1); |
2156 | 2160 | ||
2157 | string gatekeeperURI = String.Empty; | ||
2158 | IConfigSource config = m_ScriptEngine.ConfigSource; | 2161 | IConfigSource config = m_ScriptEngine.ConfigSource; |
2162 | string gatekeeperURI = Util.GetConfigVarWithDefaultSection(config, "GatekeeperURI", string.Empty); | ||
2163 | |||
2164 | if (!string.IsNullOrEmpty(gatekeeperURI)) | ||
2165 | return gatekeeperURI; | ||
2159 | 2166 | ||
2167 | // Legacy. Remove soon! | ||
2160 | if (config.Configs["GridService"] != null) | 2168 | if (config.Configs["GridService"] != null) |
2161 | gatekeeperURI = config.Configs["GridService"].GetString("Gatekeeper", gatekeeperURI); | 2169 | gatekeeperURI = config.Configs["GridService"].GetString("Gatekeeper", gatekeeperURI); |
2162 | 2170 | ||
diff --git a/OpenSim/Server/Handlers/Grid/GridInfoHandlers.cs b/OpenSim/Server/Handlers/Grid/GridInfoHandlers.cs index 965a54e..35f86c5 100644 --- a/OpenSim/Server/Handlers/Grid/GridInfoHandlers.cs +++ b/OpenSim/Server/Handlers/Grid/GridInfoHandlers.cs | |||
@@ -170,14 +170,6 @@ namespace OpenSim.Server.Handlers.Grid | |||
170 | public string JsonGetGridInfoMethod(string request, string path, string param, | 170 | public string JsonGetGridInfoMethod(string request, string path, string param, |
171 | IOSHttpRequest httpRequest, IOSHttpResponse httpResponse) | 171 | IOSHttpRequest httpRequest, IOSHttpResponse httpResponse) |
172 | { | 172 | { |
173 | string HomeURI = String.Empty; | ||
174 | IConfig cfg = m_Config.Configs["LoginService"]; | ||
175 | |||
176 | if (null != cfg) | ||
177 | { | ||
178 | HomeURI = cfg.GetString("SRV_HomeURI", HomeURI); | ||
179 | } | ||
180 | |||
181 | OSDMap map = new OSDMap(); | 173 | OSDMap map = new OSDMap(); |
182 | 174 | ||
183 | foreach (string k in _info.Keys) | 175 | foreach (string k in _info.Keys) |
@@ -185,9 +177,19 @@ namespace OpenSim.Server.Handlers.Grid | |||
185 | map[k] = OSD.FromString(_info[k].ToString()); | 177 | map[k] = OSD.FromString(_info[k].ToString()); |
186 | } | 178 | } |
187 | 179 | ||
180 | string HomeURI = Util.GetConfigVarWithDefaultSection(m_Config, "HomeURI", string.Empty); | ||
181 | |||
188 | if (!String.IsNullOrEmpty(HomeURI)) | 182 | if (!String.IsNullOrEmpty(HomeURI)) |
183 | map["home"] = OSD.FromString(HomeURI); | ||
184 | else // Legacy. Remove soon! | ||
189 | { | 185 | { |
190 | map["home"] = OSD.FromString(HomeURI); | 186 | IConfig cfg = m_Config.Configs["LoginService"]; |
187 | |||
188 | if (null != cfg) | ||
189 | HomeURI = cfg.GetString("SRV_HomeURI", HomeURI); | ||
190 | |||
191 | if (!String.IsNullOrEmpty(HomeURI)) | ||
192 | map["home"] = OSD.FromString(HomeURI); | ||
191 | } | 193 | } |
192 | 194 | ||
193 | return OSDParser.SerializeJsonString(map).ToString(); | 195 | return OSDParser.SerializeJsonString(map).ToString(); |
diff --git a/OpenSim/Services/GridService/HypergridLinker.cs b/OpenSim/Services/GridService/HypergridLinker.cs index 073197f..3e7c556 100644 --- a/OpenSim/Services/GridService/HypergridLinker.cs +++ b/OpenSim/Services/GridService/HypergridLinker.cs | |||
@@ -128,7 +128,9 @@ namespace OpenSim.Services.GridService | |||
128 | 128 | ||
129 | m_MapTileDirectory = gridConfig.GetString("MapTileDirectory", "maptiles"); | 129 | m_MapTileDirectory = gridConfig.GetString("MapTileDirectory", "maptiles"); |
130 | 130 | ||
131 | m_ThisGatekeeper = gridConfig.GetString("Gatekeeper", string.Empty); | 131 | m_ThisGatekeeper = Util.GetConfigVarWithDefaultSection(config, "GatekeeperURI", "GridService"); |
132 | // Legacy. Remove soon! | ||
133 | m_ThisGatekeeper = gridConfig.GetString("Gatekeeper", m_ThisGatekeeper); | ||
132 | try | 134 | try |
133 | { | 135 | { |
134 | m_ThisGatekeeperURI = new Uri(m_ThisGatekeeper); | 136 | m_ThisGatekeeperURI = new Uri(m_ThisGatekeeper); |
diff --git a/OpenSim/Services/HypergridService/GatekeeperService.cs b/OpenSim/Services/HypergridService/GatekeeperService.cs index 7b84d55..21f363c 100644 --- a/OpenSim/Services/HypergridService/GatekeeperService.cs +++ b/OpenSim/Services/HypergridService/GatekeeperService.cs | |||
@@ -96,7 +96,8 @@ namespace OpenSim.Services.HypergridService | |||
96 | UUID.TryParse(scope, out m_ScopeID); | 96 | UUID.TryParse(scope, out m_ScopeID); |
97 | //m_WelcomeMessage = serverConfig.GetString("WelcomeMessage", "Welcome to OpenSim!"); | 97 | //m_WelcomeMessage = serverConfig.GetString("WelcomeMessage", "Welcome to OpenSim!"); |
98 | m_AllowTeleportsToAnyRegion = serverConfig.GetBoolean("AllowTeleportsToAnyRegion", true); | 98 | m_AllowTeleportsToAnyRegion = serverConfig.GetBoolean("AllowTeleportsToAnyRegion", true); |
99 | m_ExternalName = serverConfig.GetString("ExternalName", string.Empty); | 99 | m_ExternalName = Util.GetConfigVarWithDefaultSection(config, "GatekeeperURI", "GatekeeperService"); |
100 | m_ExternalName = serverConfig.GetString("ExternalName", m_ExternalName); | ||
100 | if (m_ExternalName != string.Empty && !m_ExternalName.EndsWith("/")) | 101 | if (m_ExternalName != string.Empty && !m_ExternalName.EndsWith("/")) |
101 | m_ExternalName = m_ExternalName + "/"; | 102 | m_ExternalName = m_ExternalName + "/"; |
102 | 103 | ||
diff --git a/OpenSim/Services/HypergridService/HGInventoryService.cs b/OpenSim/Services/HypergridService/HGInventoryService.cs index 2e9bd40..a9661f4 100644 --- a/OpenSim/Services/HypergridService/HGInventoryService.cs +++ b/OpenSim/Services/HypergridService/HGInventoryService.cs | |||
@@ -81,10 +81,7 @@ namespace OpenSim.Services.HypergridService | |||
81 | if (m_UserAccountService == null) | 81 | if (m_UserAccountService == null) |
82 | throw new Exception(String.Format("Unable to create UserAccountService from {0}", userAccountsDll)); | 82 | throw new Exception(String.Format("Unable to create UserAccountService from {0}", userAccountsDll)); |
83 | 83 | ||
84 | // legacy configuration [obsolete] | 84 | m_HomeURL = Util.GetConfigVarWithDefaultSection(config, "HomeURI", m_ConfigName); |
85 | m_HomeURL = invConfig.GetString("ProfileServerURI", string.Empty); | ||
86 | // Preferred | ||
87 | m_HomeURL = invConfig.GetString("HomeURI", m_HomeURL); | ||
88 | 85 | ||
89 | m_Cache = UserAccountCache.CreateUserAccountCache(m_UserAccountService); | 86 | m_Cache = UserAccountCache.CreateUserAccountCache(m_UserAccountService); |
90 | } | 87 | } |
diff --git a/OpenSim/Services/HypergridService/HGSuitcaseInventoryService.cs b/OpenSim/Services/HypergridService/HGSuitcaseInventoryService.cs index 784f136..dd546b8 100644 --- a/OpenSim/Services/HypergridService/HGSuitcaseInventoryService.cs +++ b/OpenSim/Services/HypergridService/HGSuitcaseInventoryService.cs | |||
@@ -96,8 +96,7 @@ namespace OpenSim.Services.HypergridService | |||
96 | if (m_AvatarService == null) | 96 | if (m_AvatarService == null) |
97 | throw new Exception(String.Format("Unable to create m_AvatarService from {0}", avatarDll)); | 97 | throw new Exception(String.Format("Unable to create m_AvatarService from {0}", avatarDll)); |
98 | 98 | ||
99 | // Preferred | 99 | m_HomeURL = Util.GetConfigVarWithDefaultSection(config, "HomeURI", m_ConfigName); |
100 | m_HomeURL = invConfig.GetString("HomeURI", m_HomeURL); | ||
101 | 100 | ||
102 | // m_Cache = UserAccountCache.CreateUserAccountCache(m_UserAccountService); | 101 | // m_Cache = UserAccountCache.CreateUserAccountCache(m_UserAccountService); |
103 | } | 102 | } |
diff --git a/OpenSim/Services/HypergridService/UserAgentService.cs b/OpenSim/Services/HypergridService/UserAgentService.cs index a26a922..8757a4c 100644 --- a/OpenSim/Services/HypergridService/UserAgentService.cs +++ b/OpenSim/Services/HypergridService/UserAgentService.cs | |||
@@ -131,12 +131,17 @@ namespace OpenSim.Services.HypergridService | |||
131 | LoadDomainExceptionsFromConfig(serverConfig, "AllowExcept", m_TripsAllowedExceptions); | 131 | LoadDomainExceptionsFromConfig(serverConfig, "AllowExcept", m_TripsAllowedExceptions); |
132 | LoadDomainExceptionsFromConfig(serverConfig, "DisallowExcept", m_TripsDisallowedExceptions); | 132 | LoadDomainExceptionsFromConfig(serverConfig, "DisallowExcept", m_TripsDisallowedExceptions); |
133 | 133 | ||
134 | m_GridName = serverConfig.GetString("ExternalName", string.Empty); | 134 | m_GridName = Util.GetConfigVarWithDefaultSection(config, "GatekeeperURI", "UserAgentService"); |
135 | if (m_GridName == string.Empty) | 135 | if (string.IsNullOrEmpty(m_GridName)) // Legacy. Remove soon. |
136 | { | 136 | { |
137 | serverConfig = config.Configs["GatekeeperService"]; | ||
138 | m_GridName = serverConfig.GetString("ExternalName", string.Empty); | 137 | m_GridName = serverConfig.GetString("ExternalName", string.Empty); |
138 | if (m_GridName == string.Empty) | ||
139 | { | ||
140 | serverConfig = config.Configs["GatekeeperService"]; | ||
141 | m_GridName = serverConfig.GetString("ExternalName", string.Empty); | ||
142 | } | ||
139 | } | 143 | } |
144 | |||
140 | if (!m_GridName.EndsWith("/")) | 145 | if (!m_GridName.EndsWith("/")) |
141 | m_GridName = m_GridName + "/"; | 146 | m_GridName = m_GridName + "/"; |
142 | 147 | ||
diff --git a/OpenSim/Services/LLLoginService/LLLoginService.cs b/OpenSim/Services/LLLoginService/LLLoginService.cs index 5f30f84..7f32d30 100644 --- a/OpenSim/Services/LLLoginService/LLLoginService.cs +++ b/OpenSim/Services/LLLoginService/LLLoginService.cs | |||
@@ -110,7 +110,7 @@ namespace OpenSim.Services.LLLoginService | |||
110 | m_RequireInventory = m_LoginServerConfig.GetBoolean("RequireInventory", true); | 110 | m_RequireInventory = m_LoginServerConfig.GetBoolean("RequireInventory", true); |
111 | m_AllowRemoteSetLoginLevel = m_LoginServerConfig.GetBoolean("AllowRemoteSetLoginLevel", false); | 111 | m_AllowRemoteSetLoginLevel = m_LoginServerConfig.GetBoolean("AllowRemoteSetLoginLevel", false); |
112 | m_MinLoginLevel = m_LoginServerConfig.GetInt("MinLoginLevel", 0); | 112 | m_MinLoginLevel = m_LoginServerConfig.GetInt("MinLoginLevel", 0); |
113 | m_GatekeeperURL = m_LoginServerConfig.GetString("GatekeeperURI", string.Empty); | 113 | m_GatekeeperURL = Util.GetConfigVarWithDefaultSection(config, "GatekeeperURI", "LoginService"); |
114 | m_MapTileURL = m_LoginServerConfig.GetString("MapTileURL", string.Empty); | 114 | m_MapTileURL = m_LoginServerConfig.GetString("MapTileURL", string.Empty); |
115 | m_ProfileURL = m_LoginServerConfig.GetString("ProfileServerURL", string.Empty); | 115 | m_ProfileURL = m_LoginServerConfig.GetString("ProfileServerURL", string.Empty); |
116 | m_OpenIDURL = m_LoginServerConfig.GetString("OpenIDServerURL", String.Empty); | 116 | m_OpenIDURL = m_LoginServerConfig.GetString("OpenIDServerURL", String.Empty); |
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example index cb978f1..4199441 100644 --- a/bin/OpenSim.ini.example +++ b/bin/OpenSim.ini.example | |||
@@ -346,6 +346,21 @@ | |||
346 | ;; - "Imprudence 1.3.1" has access | 346 | ;; - "Imprudence 1.3.1" has access |
347 | ; BannedViewerList = | 347 | ; BannedViewerList = |
348 | 348 | ||
349 | ;# {HomeURI} {Hypergrid} {The Home URL of this world} {} | ||
350 | ;; If this is a standalone world, this is the address of this instance. | ||
351 | ;; If this is a grided simulator, this is the address of the external robust server that | ||
352 | ;; runs the UserAgentsService. | ||
353 | ;; For example http://myworld.com:9000 or http://myworld.com:8002 | ||
354 | ;; This is a default that can be overwritten in some sections. | ||
355 | ; HomeURI = "http://127.0.0.1:9000" | ||
356 | |||
357 | ;# {GatekeeperURI} {Hypergrid} {The URL of the gatekeeper of this world} {} | ||
358 | ;; If this is a standalone world, this is the address of this instance. | ||
359 | ;; If this is a grided simulator, this is the address of the external robust server | ||
360 | ;; that runs the Gatekeeper service. | ||
361 | ;; For example http://myworld.com:9000 or http://myworld.com:8002 | ||
362 | ;; This is a default that can be overwritten in some sections. | ||
363 | ; GatekeeperURI = "http://127.0.0.1:9000" | ||
349 | 364 | ||
350 | [Estates] | 365 | [Estates] |
351 | ; If these values are commented out then the user will be asked for estate details when required (this is the normal case). | 366 | ; If these values are commented out then the user will be asked for estate details when required (this is the normal case). |
@@ -961,6 +976,7 @@ | |||
961 | ;# {HomeURI} {ServicesConnectorModule:Groups HG Service Connector} {What's the home address of this world?} {} | 976 | ;# {HomeURI} {ServicesConnectorModule:Groups HG Service Connector} {What's the home address of this world?} {} |
962 | ;; Used for V2 in HG only. For example | 977 | ;; Used for V2 in HG only. For example |
963 | ;; http://mygridserver.com:9000 or http://mygridserver.com:8002 | 978 | ;; http://mygridserver.com:9000 or http://mygridserver.com:8002 |
979 | ;; If you have this set under [Startup], no need to set it here, leave it commented | ||
964 | ; HomeURI = "" | 980 | ; HomeURI = "" |
965 | 981 | ||
966 | ;# {MessagingEnabled} {Module:GroupsModule Module:Groups Module V2} {Is groups messaging enabled?} {true false} true | 982 | ;# {MessagingEnabled} {Module:GroupsModule Module:Groups Module V2} {Is groups messaging enabled?} {true false} true |
diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example index 3858a3c..274132e 100644 --- a/bin/Robust.HG.ini.example +++ b/bin/Robust.HG.ini.example | |||
@@ -22,17 +22,31 @@ | |||
22 | ; * | 22 | ; * |
23 | [Startup] | 23 | [Startup] |
24 | 24 | ||
25 | ; Plugin Registry Location | 25 | ; Plugin Registry Location |
26 | ; Set path to directory for plugin registry. Information | 26 | ; Set path to directory for plugin registry. Information |
27 | ; about the registered repositories and installed plugins | 27 | ; about the registered repositories and installed plugins |
28 | ; will be stored here | 28 | ; will be stored here |
29 | ; The Robust.exe process must hvae R/W access to the location | 29 | ; The Robust.exe process must hvae R/W access to the location |
30 | RegistryLocation = "." | 30 | RegistryLocation = "." |
31 | 31 | ||
32 | ; Modular configurations | 32 | ; Modular configurations |
33 | ; Set path to directory for modular ini files... | 33 | ; Set path to directory for modular ini files... |
34 | ; The Robust.exe process must hvae R/W access to the location | 34 | ; The Robust.exe process must hvae R/W access to the location |
35 | ConfigDirectory = "/home/opensim/etc/Configs" | 35 | ConfigDirectory = "/home/opensim/etc/Configs" |
36 | |||
37 | ;# {HomeURI} {Hypergrid} {The Home URL of this world} {} | ||
38 | ;; This is the address of the external robust server that | ||
39 | ;; runs the UserAgentsService, possibly this server. | ||
40 | ;; For example http://myworld.com:8002 | ||
41 | ;; This is a default that can be overwritten in some sections. | ||
42 | ; HomeURI = "http://127.0.0.1:8002" | ||
43 | |||
44 | ;# {GatekeeperURI} {Hypergrid} {The URL of the gatekeeper of this world} {} | ||
45 | ;; This is the address of the external robust server | ||
46 | ;; that runs the Gatekeeper service, possibly this server. | ||
47 | ;; For example http://myworld.com:8002 | ||
48 | ;; This is a default that can be overwritten in some sections. | ||
49 | ; GatekeeperURI = "http://127.0.0.1:8002" | ||
36 | 50 | ||
37 | [ServiceList] | 51 | [ServiceList] |
38 | 52 | ||
@@ -155,7 +169,8 @@ HGAssetServiceConnector = "HGAssetService@8002/OpenSim.Server.Handlers.dll:Asset | |||
155 | ;; Allow Hyperlinks to be created at the console | 169 | ;; Allow Hyperlinks to be created at the console |
156 | HypergridLinker = true | 170 | HypergridLinker = true |
157 | 171 | ||
158 | Gatekeeper = "http://127.0.0.1:8002" | 172 | ;; If you have this set under [Startup], no need to set it here, leave it commented |
173 | ; GatekeeperURI = "http://127.0.0.1:8002" | ||
159 | 174 | ||
160 | 175 | ||
161 | ; * This is the configuration for the freeswitch server in grid mode | 176 | ; * This is the configuration for the freeswitch server in grid mode |
@@ -309,8 +324,8 @@ HGAssetServiceConnector = "HGAssetService@8002/OpenSim.Server.Handlers.dll:Asset | |||
309 | ; HasProxy = false | 324 | ; HasProxy = false |
310 | 325 | ||
311 | ; Defaults for the users, if none is specified in the useraccounts table entry (ServiceURLs) | 326 | ; Defaults for the users, if none is specified in the useraccounts table entry (ServiceURLs) |
312 | ; CHANGE THIS | 327 | ;; If you have Gatekeeper set under [Startup], no need to set it here, leave it commented |
313 | GatekeeperURI = "http://127.0.0.1:8002" | 328 | ; GatekeeperURI = "http://127.0.0.1:8002" |
314 | 329 | ||
315 | SRV_HomeURI = "http://127.0.0.1:8002" | 330 | SRV_HomeURI = "http://127.0.0.1:8002" |
316 | SRV_InventoryServerURI = "http://127.0.0.1:8002" | 331 | SRV_InventoryServerURI = "http://127.0.0.1:8002" |
@@ -417,8 +432,8 @@ HGAssetServiceConnector = "HGAssetService@8002/OpenSim.Server.Handlers.dll:Asset | |||
417 | AuthenticationService = "OpenSim.Services.Connectors.dll:AuthenticationServicesConnector" | 432 | AuthenticationService = "OpenSim.Services.Connectors.dll:AuthenticationServicesConnector" |
418 | SimulationService ="OpenSim.Services.Connectors.dll:SimulationServiceConnector" | 433 | SimulationService ="OpenSim.Services.Connectors.dll:SimulationServiceConnector" |
419 | ; how does the outside world reach me? This acts as public key too. | 434 | ; how does the outside world reach me? This acts as public key too. |
420 | ; CHANGE THIS | 435 | ;; If you have GatekeeperURI set under [Startup], no need to set it here, leave it commented |
421 | ExternalName = "http://127.0.0.1:8002" | 436 | ; ExternalName = "http://127.0.0.1:8002" |
422 | 437 | ||
423 | ; Does this grid allow incoming links to any region in it? | 438 | ; Does this grid allow incoming links to any region in it? |
424 | ; If false, HG TPs happen only to the Default regions specified in [GridService] section | 439 | ; If false, HG TPs happen only to the Default regions specified in [GridService] section |
@@ -511,7 +526,9 @@ HGAssetServiceConnector = "HGAssetService@8002/OpenSim.Server.Handlers.dll:Asset | |||
511 | 526 | ||
512 | UserAccountsService = "OpenSim.Services.UserAccountService.dll:UserAccountService" | 527 | UserAccountsService = "OpenSim.Services.UserAccountService.dll:UserAccountService" |
513 | AvatarService = "OpenSim.Services.AvatarService.dll:AvatarService" | 528 | AvatarService = "OpenSim.Services.AvatarService.dll:AvatarService" |
514 | HomeURI = "http://127.0.0.1:8002" | 529 | |
530 | ;; Can overwrite the default in [Startup], but probably shouldn't | ||
531 | ; HomeURI = "http://127.0.0.1:8002" | ||
515 | 532 | ||
516 | ; * The interface that local users get when they are in other grids. | 533 | ; * The interface that local users get when they are in other grids. |
517 | ; * This restricts the access that the rest of the world has to | 534 | ; * This restricts the access that the rest of the world has to |
@@ -520,7 +537,9 @@ HGAssetServiceConnector = "HGAssetService@8002/OpenSim.Server.Handlers.dll:Asset | |||
520 | [HGAssetService] | 537 | [HGAssetService] |
521 | LocalServiceModule = "OpenSim.Services.HypergridService.dll:HGAssetService" | 538 | LocalServiceModule = "OpenSim.Services.HypergridService.dll:HGAssetService" |
522 | UserAccountsService = "OpenSim.Services.UserAccountService.dll:UserAccountService" | 539 | UserAccountsService = "OpenSim.Services.UserAccountService.dll:UserAccountService" |
523 | HomeURI = "http://127.0.0.1:8002" | 540 | |
541 | ;; Can overwrite the default in [Startup], but probably shouldn't | ||
542 | ; HomeURI = "http://127.0.0.1:8002" | ||
524 | 543 | ||
525 | ;; The asset types that this grid can export to / import from other grids. | 544 | ;; The asset types that this grid can export to / import from other grids. |
526 | ;; Comma separated. | 545 | ;; Comma separated. |
@@ -557,6 +576,10 @@ HGAssetServiceConnector = "HGAssetService@8002/OpenSim.Server.Handlers.dll:Asset | |||
557 | [Groups] | 576 | [Groups] |
558 | ;; for the HG Groups service | 577 | ;; for the HG Groups service |
559 | OfflineIMService = "OpenSim.Addons.OfflineIM.dll:OfflineIMService" | 578 | OfflineIMService = "OpenSim.Addons.OfflineIM.dll:OfflineIMService" |
560 | ; What is the HomeURI of users associated with this grid? | ||
561 | HomeURI = "http://127.0.0.1:8002" | ||
562 | UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService" | 579 | UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService" |
580 | |||
581 | ;; What is the HomeURI of users associated with this grid? | ||
582 | ;; Can overwrite the default in [Startup], but probably shouldn't | ||
583 | ; HomeURI = "http://127.0.0.1:8002" | ||
584 | |||
585 | |||
diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example index ffa2d49..3129078 100644 --- a/bin/config-include/StandaloneCommon.ini.example +++ b/bin/config-include/StandaloneCommon.ini.example | |||
@@ -64,8 +64,8 @@ | |||
64 | Region_Welcome_Area = "DefaultRegion, FallbackRegion" | 64 | Region_Welcome_Area = "DefaultRegion, FallbackRegion" |
65 | 65 | ||
66 | ; === HG ONLY === | 66 | ; === HG ONLY === |
67 | ;; change this to the address of your simulator | 67 | ;; If you have this set under [Startup], no need to set it here, leave it commented |
68 | Gatekeeper="http://127.0.0.1:9000" | 68 | ; GatekeeperURI="http://127.0.0.1:9000" |
69 | 69 | ||
70 | [LibraryModule] | 70 | [LibraryModule] |
71 | ; Set this if you want to change the name of the OpenSim Library | 71 | ; Set this if you want to change the name of the OpenSim Library |
@@ -73,7 +73,8 @@ | |||
73 | 73 | ||
74 | [LoginService] | 74 | [LoginService] |
75 | WelcomeMessage = "Welcome, Avatar!" | 75 | WelcomeMessage = "Welcome, Avatar!" |
76 | GatekeeperURI = "http://127.0.0.1:9000" | 76 | ;; If you have Gatekeeper set under [Startup], no need to set it here, leave it commented |
77 | ; GatekeeperURI = "http://127.0.0.1:9000" | ||
77 | 78 | ||
78 | SRV_HomeURI = "http://127.0.0.1:9000" | 79 | SRV_HomeURI = "http://127.0.0.1:9000" |
79 | SRV_InventoryServerURI = "http://127.0.0.1:9000" | 80 | SRV_InventoryServerURI = "http://127.0.0.1:9000" |
@@ -218,7 +219,8 @@ | |||
218 | ;; HG configurations | 219 | ;; HG configurations |
219 | ;; | 220 | ;; |
220 | [GatekeeperService] | 221 | [GatekeeperService] |
221 | ExternalName = "http://127.0.0.1:9000" | 222 | ;; If you have GatekeeperURI set under [Startup], no need to set it here, leave it commented |
223 | ; ExternalName = "http://127.0.0.1:9000" | ||
222 | 224 | ||
223 | ; Does this grid allow incoming links to any region in it? | 225 | ; Does this grid allow incoming links to any region in it? |
224 | ; If false, HG TPs happen only to the Default regions specified in [GridService] section | 226 | ; If false, HG TPs happen only to the Default regions specified in [GridService] section |
@@ -274,10 +276,12 @@ | |||
274 | ; AllowExcept_Level_200 = "http://griefer.com:8002, http://enemy.com:8002" | 276 | ; AllowExcept_Level_200 = "http://griefer.com:8002, http://enemy.com:8002" |
275 | 277 | ||
276 | [HGInventoryService] | 278 | [HGInventoryService] |
277 | HomeURI = "http://127.0.0.1:9000" | 279 | ;; If you have this set under [Startup], no need to set it here, leave it commented |
280 | ; HomeURI = "http://127.0.0.1:9000" | ||
278 | 281 | ||
279 | [HGAssetService] | 282 | [HGAssetService] |
280 | HomeURI = "http://127.0.0.1:9000" | 283 | ;; If you have this set under [Startup], no need to set it here, leave it commented |
284 | ; HomeURI = "http://127.0.0.1:9000" | ||
281 | 285 | ||
282 | ;; The asset types that this grid can export to / import from other grids. | 286 | ;; The asset types that this grid can export to / import from other grids. |
283 | ;; Comma separated. | 287 | ;; Comma separated. |
@@ -293,8 +297,9 @@ | |||
293 | 297 | ||
294 | 298 | ||
295 | [HGInventoryAccessModule] | 299 | [HGInventoryAccessModule] |
296 | HomeURI = "http://127.0.0.1:9000" | 300 | ;; If you have these set under [Startup], no need to set it here, leave it commented |
297 | Gatekeeper = "http://127.0.0.1:9000" | 301 | ; HomeURI = "http://127.0.0.1:9000" |
302 | ; GatekeeperURI = "http://127.0.0.1:9000" | ||
298 | 303 | ||
299 | ;; If you want to protect your assets from being copied by foreign visitors | 304 | ;; If you want to protect your assets from being copied by foreign visitors |
300 | ;; uncomment the next line. You may want to do this on sims that have licensed content. | 305 | ;; uncomment the next line. You may want to do this on sims that have licensed content. |
@@ -311,8 +316,8 @@ | |||
311 | 316 | ||
312 | [Messaging] | 317 | [Messaging] |
313 | ; === HG ONLY === | 318 | ; === HG ONLY === |
314 | ;; change this to the address of your simulator | 319 | ;; If you have this set under [Startup], no need to set it here, leave it commented |
315 | Gatekeeper = "http://127.0.0.1:9000" | 320 | ; GatekeeperURI = "http://127.0.0.1:9000" |
316 | 321 | ||
317 | 322 | ||
318 | [EntityTransfer] | 323 | [EntityTransfer] |