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

make some limit use of new libomv things

Browse Source
This commit is contained in:
UbitUmarov
2020-05-30 15:51:01 +01:00
parent 7b8db526b3
commit b541de034c
3 changed files with 82 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
OpenSim/Framework/LLSDxmlEncode.cs
View File

@@ -51,9 +51,9 @@ namespace OpenSim.Framework
public const string LLSDEmpty = "<llsd><map /></llsd>";
// got tired of creating a stringbuilder all the time;
public static StringBuilder Start(int size = 256, bool addxmlversion = false)
public static StringBuilder Start(int size = 4096, bool addxmlversion = false)
{
StringBuilder sb = new StringBuilder(size);
StringBuilder sb = osStringBuilderCache.Acquire(size);
if(addxmlversion)
sb.Append("<?xml version=\"1.0\" encoding=\"UTF-8\"?><llsd>"); // legacy llsd xml name still valid
else
@@ -69,13 +69,13 @@ namespace OpenSim.Framework
public static string End(StringBuilder sb)
{
sb.Append("</llsd>");
return sb.ToString();
return osStringBuilderCache.GetStringAndRelease(sb);
}
public static byte[] EndToNBBytes(StringBuilder sb)
{
sb.Append("</llsd>");
return Util.UTF8NBGetbytes(sb.ToString());
return Util.UTF8NBGetbytes(osStringBuilderCache.GetStringAndRelease(sb));
}
// map == a list of key value pairs
@@ -316,7 +316,7 @@ namespace OpenSim.Framework
else
{
sb.Append("<uuid>");
EscapeToXML(e.ToString(), sb);
EscapeToXML(e.ToString(), sb);
sb.Append("</uuid>");
}
}
@@ -338,7 +338,7 @@ namespace OpenSim.Framework
if(String.IsNullOrEmpty(e))
return;
sb.Append(e);
sb.Append(e);
}
public static void AddElem(Uri e, StringBuilder sb)
@@ -764,11 +764,8 @@ namespace OpenSim.Framework
public static void EscapeToXML(string s, StringBuilder sb)
{
int i;
char c;
int len = s.Length;
for (i = 0; i < len; i++)
for (int i = 0; i < s.Length; ++i)
{
c = s[i];
switch (c)

6
OpenSim/Framework/SLUtil.cs
View File

@@ -211,8 +211,8 @@ namespace OpenSim.Framework
{"animatn", AssetType.Animation},
{"gesture", AssetType.Gesture},
{"simstate", AssetType.Simstate},
{"mesh", AssetType.Mesh}
// "settings", AssetType.Settings}
{"mesh", AssetType.Mesh},
{"settings", AssetType.Settings}
};
private static Dictionary<string, FolderType> name2Inventory = new Dictionary<string, FolderType>()
{
@@ -237,7 +237,7 @@ namespace OpenSim.Framework
{"outfit", FolderType.Outfit},
{"myoutfits", FolderType.MyOutfits},
{"mesh", FolderType.Mesh},
// "settings", FolderType.Settings},
{"settings", FolderType.Settings},
{"suitcase", FolderType.Suitcase}
};