ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-05-14 18:55:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

simplify RestGetGridInfoMethod a bit more

Browse Source
This commit is contained in:
UbitUmarov
2020-12-26 03:58:22 +00:00
parent 18402bc667
commit 98e69d9015
1 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
OpenSim/Server/Handlers/Grid/GridInfoHandlers.cs
View File

@@ -27,16 +27,15 @@
using System;
using System.Collections;
using System.IO;
using System.Net;
using System.Reflection;
using System.Security;
using System.Text;
using log4net;
using Nini.Config;
using Nwc.XmlRpc;
using OpenSim.Framework;
using OpenSim.Framework.Servers.HttpServer;
using OpenMetaverse;
using OpenMetaverse.StructuredData;
namespace OpenSim.Server.Handlers.Grid
@@ -81,12 +80,8 @@ namespace OpenSim.Server.Handlers.Grid
}
else if (null != netCfg)
{
_info["login"]
= String.Format(
"http://127.0.0.1:{0}/",
netCfg.GetString(
"http_listener_port", ConfigSettings.DefaultRegionHttpPort.ToString()));
_info["login"] = string.Format("http://127.0.0.1:{0}/",
netCfg.GetString("http_listener_port", ConfigSettings.DefaultRegionHttpPort.ToString()));
IssueWarning();
}
else
@@ -138,20 +133,24 @@ namespace OpenSim.Server.Handlers.Grid
return;
}
StringBuilder sb = new StringBuilder(4096);
sb.Append("<gridinfo>\n");
osUTF8 osb = OSUTF8Cached.Acquire();
osb.AppendASCII("<gridinfo>");
foreach (string k in _info.Keys)
{
sb.AppendFormat("<{0}>{1}</{0}>\n", k, SecurityElement.Escape(_info[k].ToString()));
osb.AppendASCII('<');
osb.AppendASCII(k);
osb.AppendASCII('>');
osb.AppendASCII(SecurityElement.Escape(_info[k].ToString()));
osb.AppendASCII("</");
osb.AppendASCII(k);
osb.AppendASCII('>');
}
sb.Append("</gridinfo>\n");
httpResponse.RawBuffer = Util.UTF8Getbytes(sb.ToString());
osb.AppendASCII("</gridinfo>");
httpResponse.RawBuffer = OSUTF8Cached.GetArrayAndRelease(osb);
}
/// <summary>
/// Get GridInfo in json format: Used bu the OSSL osGetGrid*
/// Get GridInfo in json format: Used by the OSSL osGetGrid*
/// Adding the SRV_HomeIRI to the kvp returned for use in scripts
/// </summary>
/// <returns>