Moved the HG default variables out of [Startup] and into their own section [Hypergrid] in *Common.ini.example. Backwards compatible for now.
parent
a356978c79
commit
f1010d7b15
|
@ -65,7 +65,7 @@ namespace OpenSim.Groups
|
||||||
|
|
||||||
m_log.DebugFormat("[Groups.RobustHGConnector]: Starting with config name {0}", m_ConfigName);
|
m_log.DebugFormat("[Groups.RobustHGConnector]: Starting with config name {0}", m_ConfigName);
|
||||||
|
|
||||||
string homeURI = Util.GetConfigVarFromSections<string>(config, "HomeURI", new string[] { "Startup", m_ConfigName} ); //cnf.GetString("HomeURI", string.Empty);
|
string homeURI = Util.GetConfigVarFromSections<string>(config, "HomeURI", new string[] { "Startup", "Hypergrid", m_ConfigName} ); //cnf.GetString("HomeURI", string.Empty);
|
||||||
if (homeURI == string.Empty)
|
if (homeURI == string.Empty)
|
||||||
throw new Exception(String.Format("[Groups.RobustHGConnector]: please provide the HomeURI [Startup] or in section {0}", m_ConfigName));
|
throw new Exception(String.Format("[Groups.RobustHGConnector]: please provide the HomeURI [Startup] or in section {0}", m_ConfigName));
|
||||||
|
|
||||||
|
|
|
@ -65,7 +65,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Lure
|
||||||
{
|
{
|
||||||
m_Enabled = true;
|
m_Enabled = true;
|
||||||
|
|
||||||
m_ThisGridURL = Util.GetConfigVarFromSections<string>(config, "GatekeeperURI", new string[] {"Startup", "Messaging"});
|
m_ThisGridURL = Util.GetConfigVarFromSections<string>(config, "GatekeeperURI", new string[] { "Startup", "Hypergrid", "Messaging" });
|
||||||
// Legacy. Remove soon!
|
// Legacy. Remove soon!
|
||||||
m_ThisGridURL = config.Configs["Messaging"].GetString("Gatekeeper", m_ThisGridURL);
|
m_ThisGridURL = config.Configs["Messaging"].GetString("Gatekeeper", m_ThisGridURL);
|
||||||
m_log.DebugFormat("[LURE MODULE]: {0} enabled", Name);
|
m_log.DebugFormat("[LURE MODULE]: {0} enabled", Name);
|
||||||
|
|
|
@ -88,8 +88,8 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
|
||||||
IConfig thisModuleConfig = source.Configs["HGInventoryAccessModule"];
|
IConfig thisModuleConfig = source.Configs["HGInventoryAccessModule"];
|
||||||
if (thisModuleConfig != null)
|
if (thisModuleConfig != null)
|
||||||
{
|
{
|
||||||
m_HomeURI = Util.GetConfigVarFromSections<string>(source, "HomeURI", new string[] {"Startup", "HGInventoryAccessModule"});
|
m_HomeURI = Util.GetConfigVarFromSections<string>(source, "HomeURI", new string[] { "Startup", "Hypergrid", "HGInventoryAccessModule" });
|
||||||
m_ThisGatekeeper = Util.GetConfigVarFromSections<string>(source, "GatekeeperURI", new string[] {"Startup", "HGInventoryAccessModule"});
|
m_ThisGatekeeper = Util.GetConfigVarFromSections<string>(source, "GatekeeperURI", new string[] { "Startup", "Hypergrid", "HGInventoryAccessModule" });
|
||||||
// Legacy. Renove soon!
|
// Legacy. Renove soon!
|
||||||
m_ThisGatekeeper = thisModuleConfig.GetString("Gatekeeper", m_ThisGatekeeper);
|
m_ThisGatekeeper = thisModuleConfig.GetString("Gatekeeper", m_ThisGatekeeper);
|
||||||
|
|
||||||
|
|
|
@ -113,7 +113,7 @@ namespace OpenSim.Region.DataSnapshot
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
m_enabled = config.Configs["DataSnapshot"].GetBoolean("index_sims", m_enabled);
|
m_enabled = config.Configs["DataSnapshot"].GetBoolean("index_sims", m_enabled);
|
||||||
string gatekeeper = Util.GetConfigVarFromSections<string>(config, "GatekeeperURI", new string[] {"Startup", "GridService"});
|
string gatekeeper = Util.GetConfigVarFromSections<string>(config, "GatekeeperURI", new string[] { "Startup", "Hypergrid", "GridService" });
|
||||||
// Legacy. Remove soon!
|
// Legacy. Remove soon!
|
||||||
if (string.IsNullOrEmpty(gatekeeper))
|
if (string.IsNullOrEmpty(gatekeeper))
|
||||||
{
|
{
|
||||||
|
|
|
@ -2138,7 +2138,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
|
||||||
m_host.AddScriptLPS(1);
|
m_host.AddScriptLPS(1);
|
||||||
|
|
||||||
IConfigSource config = m_ScriptEngine.ConfigSource;
|
IConfigSource config = m_ScriptEngine.ConfigSource;
|
||||||
string HomeURI = Util.GetConfigVarFromSections<string>(config, "HomeURI", new string[]{"Startup"});
|
string HomeURI = Util.GetConfigVarFromSections<string>(config, "HomeURI", new string[] { "Startup", "Hypergrid" });
|
||||||
|
|
||||||
if (!string.IsNullOrEmpty(HomeURI))
|
if (!string.IsNullOrEmpty(HomeURI))
|
||||||
return HomeURI;
|
return HomeURI;
|
||||||
|
@ -2159,7 +2159,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
|
||||||
m_host.AddScriptLPS(1);
|
m_host.AddScriptLPS(1);
|
||||||
|
|
||||||
IConfigSource config = m_ScriptEngine.ConfigSource;
|
IConfigSource config = m_ScriptEngine.ConfigSource;
|
||||||
string gatekeeperURI = Util.GetConfigVarFromSections<string>(config, "GatekeeperURI", new string[] {"Startup"});
|
string gatekeeperURI = Util.GetConfigVarFromSections<string>(config, "GatekeeperURI", new string[] { "Startup", "Hypergrid" });
|
||||||
|
|
||||||
if (!string.IsNullOrEmpty(gatekeeperURI))
|
if (!string.IsNullOrEmpty(gatekeeperURI))
|
||||||
return gatekeeperURI;
|
return gatekeeperURI;
|
||||||
|
|
|
@ -177,7 +177,7 @@ namespace OpenSim.Server.Handlers.Grid
|
||||||
map[k] = OSD.FromString(_info[k].ToString());
|
map[k] = OSD.FromString(_info[k].ToString());
|
||||||
}
|
}
|
||||||
|
|
||||||
string HomeURI = Util.GetConfigVarFromSections<string>(m_Config, "HomeURI", new string[] {"Startup"});
|
string HomeURI = Util.GetConfigVarFromSections<string>(m_Config, "HomeURI", new string[] { "Startup", "Hypergrid" });
|
||||||
|
|
||||||
if (!String.IsNullOrEmpty(HomeURI))
|
if (!String.IsNullOrEmpty(HomeURI))
|
||||||
map["home"] = OSD.FromString(HomeURI);
|
map["home"] = OSD.FromString(HomeURI);
|
||||||
|
|
|
@ -128,7 +128,7 @@ namespace OpenSim.Services.GridService
|
||||||
|
|
||||||
m_MapTileDirectory = gridConfig.GetString("MapTileDirectory", "maptiles");
|
m_MapTileDirectory = gridConfig.GetString("MapTileDirectory", "maptiles");
|
||||||
|
|
||||||
m_ThisGatekeeper = Util.GetConfigVarFromSections<string>(config, "GatekeeperURI", new string[] {"Startup", "GridService"});
|
m_ThisGatekeeper = Util.GetConfigVarFromSections<string>(config, "GatekeeperURI", new string[] { "Startup", "Hypergrid", "GridService" });
|
||||||
// Legacy. Remove soon!
|
// Legacy. Remove soon!
|
||||||
m_ThisGatekeeper = gridConfig.GetString("Gatekeeper", m_ThisGatekeeper);
|
m_ThisGatekeeper = gridConfig.GetString("Gatekeeper", m_ThisGatekeeper);
|
||||||
try
|
try
|
||||||
|
|
|
@ -96,7 +96,7 @@ namespace OpenSim.Services.HypergridService
|
||||||
UUID.TryParse(scope, out m_ScopeID);
|
UUID.TryParse(scope, out m_ScopeID);
|
||||||
//m_WelcomeMessage = serverConfig.GetString("WelcomeMessage", "Welcome to OpenSim!");
|
//m_WelcomeMessage = serverConfig.GetString("WelcomeMessage", "Welcome to OpenSim!");
|
||||||
m_AllowTeleportsToAnyRegion = serverConfig.GetBoolean("AllowTeleportsToAnyRegion", true);
|
m_AllowTeleportsToAnyRegion = serverConfig.GetBoolean("AllowTeleportsToAnyRegion", true);
|
||||||
m_ExternalName = Util.GetConfigVarFromSections<string>(config, "GatekeeperURI", new string[] {"Startup", "GatekeeperService"});
|
m_ExternalName = Util.GetConfigVarFromSections<string>(config, "GatekeeperURI", new string[] { "Startup", "Hypergrid", "GatekeeperService" });
|
||||||
m_ExternalName = serverConfig.GetString("ExternalName", m_ExternalName);
|
m_ExternalName = serverConfig.GetString("ExternalName", m_ExternalName);
|
||||||
if (m_ExternalName != string.Empty && !m_ExternalName.EndsWith("/"))
|
if (m_ExternalName != string.Empty && !m_ExternalName.EndsWith("/"))
|
||||||
m_ExternalName = m_ExternalName + "/";
|
m_ExternalName = m_ExternalName + "/";
|
||||||
|
|
|
@ -81,7 +81,7 @@ namespace OpenSim.Services.HypergridService
|
||||||
if (m_UserAccountService == null)
|
if (m_UserAccountService == null)
|
||||||
throw new Exception(String.Format("Unable to create UserAccountService from {0}", userAccountsDll));
|
throw new Exception(String.Format("Unable to create UserAccountService from {0}", userAccountsDll));
|
||||||
|
|
||||||
m_HomeURL = Util.GetConfigVarFromSections<string>(config, "HomeURI", new string[] {"Startup", m_ConfigName});
|
m_HomeURL = Util.GetConfigVarFromSections<string>(config, "HomeURI", new string[] { "Startup", "Hypergrid", m_ConfigName });
|
||||||
|
|
||||||
m_Cache = UserAccountCache.CreateUserAccountCache(m_UserAccountService);
|
m_Cache = UserAccountCache.CreateUserAccountCache(m_UserAccountService);
|
||||||
}
|
}
|
||||||
|
|
|
@ -96,7 +96,7 @@ namespace OpenSim.Services.HypergridService
|
||||||
if (m_AvatarService == null)
|
if (m_AvatarService == null)
|
||||||
throw new Exception(String.Format("Unable to create m_AvatarService from {0}", avatarDll));
|
throw new Exception(String.Format("Unable to create m_AvatarService from {0}", avatarDll));
|
||||||
|
|
||||||
m_HomeURL = Util.GetConfigVarFromSections<string>(config, "HomeURI", new string[] {"Startup", m_ConfigName});
|
m_HomeURL = Util.GetConfigVarFromSections<string>(config, "HomeURI", new string[] { "Startup", "Hypergrid", m_ConfigName });
|
||||||
|
|
||||||
// m_Cache = UserAccountCache.CreateUserAccountCache(m_UserAccountService);
|
// m_Cache = UserAccountCache.CreateUserAccountCache(m_UserAccountService);
|
||||||
}
|
}
|
||||||
|
|
|
@ -131,7 +131,7 @@ namespace OpenSim.Services.HypergridService
|
||||||
LoadDomainExceptionsFromConfig(serverConfig, "AllowExcept", m_TripsAllowedExceptions);
|
LoadDomainExceptionsFromConfig(serverConfig, "AllowExcept", m_TripsAllowedExceptions);
|
||||||
LoadDomainExceptionsFromConfig(serverConfig, "DisallowExcept", m_TripsDisallowedExceptions);
|
LoadDomainExceptionsFromConfig(serverConfig, "DisallowExcept", m_TripsDisallowedExceptions);
|
||||||
|
|
||||||
m_GridName = Util.GetConfigVarFromSections<string>(config, "GatekeeperURI", new string[] {"Startup", "UserAgentService"});
|
m_GridName = Util.GetConfigVarFromSections<string>(config, "GatekeeperURI", new string[] { "Startup", "Hypergrid", "UserAgentService" });
|
||||||
if (string.IsNullOrEmpty(m_GridName)) // Legacy. Remove soon.
|
if (string.IsNullOrEmpty(m_GridName)) // Legacy. Remove soon.
|
||||||
{
|
{
|
||||||
m_GridName = serverConfig.GetString("ExternalName", string.Empty);
|
m_GridName = serverConfig.GetString("ExternalName", string.Empty);
|
||||||
|
|
|
@ -110,7 +110,7 @@ namespace OpenSim.Services.LLLoginService
|
||||||
m_RequireInventory = m_LoginServerConfig.GetBoolean("RequireInventory", true);
|
m_RequireInventory = m_LoginServerConfig.GetBoolean("RequireInventory", true);
|
||||||
m_AllowRemoteSetLoginLevel = m_LoginServerConfig.GetBoolean("AllowRemoteSetLoginLevel", false);
|
m_AllowRemoteSetLoginLevel = m_LoginServerConfig.GetBoolean("AllowRemoteSetLoginLevel", false);
|
||||||
m_MinLoginLevel = m_LoginServerConfig.GetInt("MinLoginLevel", 0);
|
m_MinLoginLevel = m_LoginServerConfig.GetInt("MinLoginLevel", 0);
|
||||||
m_GatekeeperURL = Util.GetConfigVarFromSections<string>(config, "GatekeeperURI", new string[] {"Startup", "LoginService"});
|
m_GatekeeperURL = Util.GetConfigVarFromSections<string>(config, "GatekeeperURI", new string[] { "Startup", "Hypergrid", "LoginService" });
|
||||||
m_MapTileURL = m_LoginServerConfig.GetString("MapTileURL", string.Empty);
|
m_MapTileURL = m_LoginServerConfig.GetString("MapTileURL", string.Empty);
|
||||||
m_ProfileURL = m_LoginServerConfig.GetString("ProfileServerURL", string.Empty);
|
m_ProfileURL = m_LoginServerConfig.GetString("ProfileServerURL", string.Empty);
|
||||||
m_OpenIDURL = m_LoginServerConfig.GetString("OpenIDServerURL", String.Empty);
|
m_OpenIDURL = m_LoginServerConfig.GetString("OpenIDServerURL", String.Empty);
|
||||||
|
|
|
@ -320,23 +320,6 @@
|
||||||
;; - "Imprudence 1.3.1" has access
|
;; - "Imprudence 1.3.1" has access
|
||||||
; BannedViewerList =
|
; BannedViewerList =
|
||||||
|
|
||||||
;# {HomeURI} {Hypergrid} {The Home URL of this world} {}
|
|
||||||
;; If this is a standalone world, this is the address of this instance.
|
|
||||||
;; If this is a grided simulator, this is the address of the external robust server that
|
|
||||||
;; runs the UserAgentsService.
|
|
||||||
;; For example http://myworld.com:9000 or http://myworld.com:8002
|
|
||||||
;; This is a default that can be overwritten in some sections.
|
|
||||||
; HomeURI = "http://127.0.0.1:9000"
|
|
||||||
|
|
||||||
;# {GatekeeperURI} {Hypergrid} {The URL of the gatekeeper of this world} {}
|
|
||||||
;; If this is a standalone world, this is the address of this instance.
|
|
||||||
;; If this is a grided simulator, this is the address of the external robust server
|
|
||||||
;; that runs the Gatekeeper service.
|
|
||||||
;; For example http://myworld.com:9000 or http://myworld.com:8002
|
|
||||||
;; This is a default that can be overwritten in some sections.
|
|
||||||
; GatekeeperURI = "http://127.0.0.1:9000"
|
|
||||||
|
|
||||||
|
|
||||||
[Map]
|
[Map]
|
||||||
;# {GenerateMaptiles} {} {Generate map tiles?} {true false} true
|
;# {GenerateMaptiles} {} {Generate map tiles?} {true false} true
|
||||||
;; Map tile options. You can choose to generate normal maptiles or nominate an uploaded texture to
|
;; Map tile options. You can choose to generate normal maptiles or nominate an uploaded texture to
|
||||||
|
|
|
@ -26,6 +26,26 @@
|
||||||
;StorageProvider = "OpenSim.Data.MSSQL.dll"
|
;StorageProvider = "OpenSim.Data.MSSQL.dll"
|
||||||
;ConnectionString = "Server=localhost\SQLEXPRESS;Database=opensim;User Id=opensim; password=***;"
|
;ConnectionString = "Server=localhost\SQLEXPRESS;Database=opensim;User Id=opensim; password=***;"
|
||||||
|
|
||||||
|
[Hypergrid]
|
||||||
|
; Uncomment the variables in this section only if you are in
|
||||||
|
; Hypergrid configuration. Otherwise, ignore.
|
||||||
|
|
||||||
|
;# {HomeURI} {Hypergrid} {The Home URL of this world} {}
|
||||||
|
;; If this is a standalone world, this is the address of this instance.
|
||||||
|
;; If this is a grided simulator, this is the address of the external robust server that
|
||||||
|
;; runs the UserAgentsService.
|
||||||
|
;; For example http://myworld.com:9000 or http://myworld.com:8002
|
||||||
|
;; This is a default that can be overwritten in some sections.
|
||||||
|
; HomeURI = "http://127.0.0.1:9000"
|
||||||
|
|
||||||
|
;# {GatekeeperURI} {Hypergrid} {The URL of the gatekeeper of this world} {}
|
||||||
|
;; If this is a standalone world, this is the address of this instance.
|
||||||
|
;; If this is a grided simulator, this is the address of the external robust server
|
||||||
|
;; that runs the Gatekeeper service.
|
||||||
|
;; For example http://myworld.com:9000 or http://myworld.com:8002
|
||||||
|
;; This is a default that can be overwritten in some sections.
|
||||||
|
; GatekeeperURI = "http://127.0.0.1:9000"
|
||||||
|
|
||||||
[Modules]
|
[Modules]
|
||||||
;; Choose one cache module and the corresponding config file, if it exists.
|
;; Choose one cache module and the corresponding config file, if it exists.
|
||||||
;; Copy the config .example file into your own .ini file and adapt that.
|
;; Copy the config .example file into your own .ini file and adapt that.
|
||||||
|
|
|
@ -27,6 +27,27 @@
|
||||||
;StorageProvider = "OpenSim.Data.MSSQL.dll"
|
;StorageProvider = "OpenSim.Data.MSSQL.dll"
|
||||||
;ConnectionString = "Server=localhost\SQLEXPRESS;Database=opensim;User Id=opensim; password=***;"
|
;ConnectionString = "Server=localhost\SQLEXPRESS;Database=opensim;User Id=opensim; password=***;"
|
||||||
|
|
||||||
|
[Hypergrid]
|
||||||
|
; Uncomment the variables in this section only if you are in
|
||||||
|
; Hypergrid configuration. Otherwise, ignore.
|
||||||
|
|
||||||
|
;# {HomeURI} {Hypergrid} {The Home URL of this world} {}
|
||||||
|
;; If this is a standalone world, this is the address of this instance.
|
||||||
|
;; If this is a grided simulator, this is the address of the external robust server that
|
||||||
|
;; runs the UserAgentsService.
|
||||||
|
;; For example http://myworld.com:9000 or http://myworld.com:8002
|
||||||
|
;; This is a default that can be overwritten in some sections.
|
||||||
|
; HomeURI = "http://127.0.0.1:9000"
|
||||||
|
|
||||||
|
;# {GatekeeperURI} {Hypergrid} {The URL of the gatekeeper of this world} {}
|
||||||
|
;; If this is a standalone world, this is the address of this instance.
|
||||||
|
;; If this is a grided simulator, this is the address of the external robust server
|
||||||
|
;; that runs the Gatekeeper service.
|
||||||
|
;; For example http://myworld.com:9000 or http://myworld.com:8002
|
||||||
|
;; This is a default that can be overwritten in some sections.
|
||||||
|
; GatekeeperURI = "http://127.0.0.1:9000"
|
||||||
|
|
||||||
|
|
||||||
[Modules]
|
[Modules]
|
||||||
;; Choose one cache module and the corresponding config file, if it exists.
|
;; Choose one cache module and the corresponding config file, if it exists.
|
||||||
;; Copy the config .example file into your own .ini file and alter that
|
;; Copy the config .example file into your own .ini file and alter that
|
||||||
|
|
Loading…
Reference in New Issue