diff --git a/OpenSim/Services/GridService/GridService.cs b/OpenSim/Services/GridService/GridService.cs index f706b4906e..0570187822 100755 --- a/OpenSim/Services/GridService/GridService.cs +++ b/OpenSim/Services/GridService/GridService.cs @@ -194,6 +194,16 @@ namespace OpenSim.Services.GridService if (!string.IsNullOrEmpty(configVal)) m_ExtraFeatures["GridNick"] = configVal; + configVal = Util.GetConfigVarFromSections( + config, "GridStatus", new string[] { "GridInfo", "GridInfoService" }, string.Empty); + if (!string.IsNullOrEmpty(configVal)) + m_ExtraFeatures["GridStatus"] = configVal; + + configVal = Util.GetConfigVarFromSections( + config, "GridStatusRSS", new string[] { "GridInfo", "GridInfoService" }, string.Empty); + if (!string.IsNullOrEmpty(configVal)) + m_ExtraFeatures["GridStatusRSS"] = configVal; + m_ExtraFeatures["ExportSupported"] = gridConfig.GetString("ExportSupported", "true"); string[] sections = new string[] { "Const, Startup", "Hypergrid", "GatekeeperService" }; diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example index 0a677e8278..8b31d2eb6d 100644 --- a/bin/Robust.HG.ini.example +++ b/bin/Robust.HG.ini.example @@ -634,6 +634,10 @@ ; this is the entry point for all the regions of the world ; gatekeeper = ${Const|BaseURL}:${Const|PublicPort}/ + ; a http page for grid status + ;GridStatus = ${Const|BaseURL}:${Const|PublicPort}/GridStatus + ; a RSS page for grid status + ;GridStatusRSS = ${Const|BaseURL}:${Const|PublicPort}/GridStatusRSS [GatekeeperService] LocalServiceModule = "OpenSim.Services.HypergridService.dll:GatekeeperService" diff --git a/bin/Robust.ini.example b/bin/Robust.ini.example index 50986de847..97aa95fbd1 100644 --- a/bin/Robust.ini.example +++ b/bin/Robust.ini.example @@ -551,6 +551,10 @@ ; password help: optional: page providing password assistance for users of your grid ;password = ${Const|BaseURL}/password + ; a http page for grid status + ;GridStatus = ${Const|BaseURL}:${Const|PublicPort}/GridStatus + ; a RSS page for grid status + ;GridStatusRSS = ${Const|BaseURL}:${Const|PublicPort}/GridStatusRSS [Messaging] ; OfflineIM diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example index 6acc2a6ea4..2d7175b6b6 100644 --- a/bin/config-include/StandaloneCommon.ini.example +++ b/bin/config-include/StandaloneCommon.ini.example @@ -252,6 +252,11 @@ ; this is the entry point for all user-related HG services ; uas = ${Const|BaseURL}:${Const|PublicPort}/ + // a http page for grid status + ;GridStatus = ${Const|BaseURL}:${Const|PublicPort}/GridStatus + // a RSS page for grid status + ;GridStatusRSS = ${Const|BaseURL}:${Const|PublicPort}/GridStatusRSS + [MapImageService] ; Set this if you want to change the default ; TilesStoragePath = "maptiles"