ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-06 01:06:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

change handling of option ExportSupported again

Browse Source
This commit is contained in:
UbitUmarov
2022-05-13 01:50:24 +01:00
parent ed120a572d
commit fa02512c20
2 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
OpenSim/Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.cs
View File

@@ -161,11 +161,10 @@ namespace OpenSim.Region.ClientStack.Linden
m_features["MaxAgentGroupsPremium"] = OSD.FromInteger(Constants.MaxAgentGroups);
// Extra information for viewers that want to use it
// TODO: Take these out of here into their respective modules, like map-server-url
OSDMap extrasMap;
if(m_features.ContainsKey("OpenSimExtras"))
if(m_features.TryGetValue("OpenSimExtras", out OSD oe))
{
extrasMap = (OSDMap)m_features["OpenSimExtras"];
extrasMap = oe as OSDMap;
}
else
extrasMap = new OSDMap();
@@ -180,8 +179,7 @@ namespace OpenSim.Region.ClientStack.Linden
if (m_ExportSupported)
extrasMap["ExportSupported"] = true;
if (extrasMap.Count > 0)
m_features["OpenSimExtras"] = extrasMap;
m_features["OpenSimExtras"] = extrasMap;
}
}
@@ -373,20 +371,20 @@ namespace OpenSim.Region.ClientStack.Linden
case "destination-guide-url":
ginfo.DestinationGuideURL = val;
break;
/* keep this local to avoid issues with diferent modules
case "currency-base-uri":
ginfo.EconomyURL = val;
// keep this local to avoid issues with diferent modules
// ginfo.EconomyURL = val;
break;
*/
default:
extrasMap[key] = val;
if (key == "ExportSupported")
{
bool.TryParse(val, out m_ExportSupported);
extrasMap[key] = m_ExportSupported;
}
else
extrasMap[key] = val;
break;
}
}
m_features["OpenSimExtras"] = extrasMap;
}

2
OpenSim/Services/GridService/GridService.cs
View File

@@ -204,7 +204,7 @@ namespace OpenSim.Services.GridService
if (!string.IsNullOrEmpty(configVal))
m_ExtraFeatures["GridStatusRSS"] = configVal;
m_ExtraFeatures["ExportSupported"] = gridConfig.GetBoolean("ExportSupported", true);
m_ExtraFeatures["ExportSupported"] = gridConfig.GetString("ExportSupported", "true");
string[] sections = new string[] { "Const, Startup", "Hypergrid", "GatekeeperService" };
string gatekeeperURIAlias = Util.GetConfigVarFromSections<string>(config, "GatekeeperURIAlias", sections, string.Empty);