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

EstateAccess do fill the fields(mySQL only); fix the response

Browse Source
This commit is contained in:
UbitUmarov
2019-08-17 23:57:05 +01:00
parent eb9cf78e6b
commit db374112c6
5 changed files with 64 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
OpenSim/Framework/EstateBan.cs
View File

@@ -67,6 +67,9 @@ namespace OpenSim.Framework
}
}
public UUID BanningUserID { get; set; }
public int BanTime;
private string m_bannedHostAddress = string.Empty;
/// <summary>
/// IP address or domain name of the banned client.
@@ -143,6 +146,8 @@ namespace OpenSim.Framework
p.SetValue(this, Boolean.Parse((string)map[p.Name]), null);
else if (value is UUID)
p.SetValue(this, UUID.Parse((string)map[p.Name]), null);
else if (value is DateTime)
p.SetValue(this, DateTime.Parse((string)map[p.Name]), null);
}
}

31
OpenSim/Framework/LLSDxmlEncode.cs
View File

@@ -315,13 +315,9 @@ namespace OpenSim.Framework
public static void AddRawElem(string e, StringBuilder sb)
{
if(String.IsNullOrEmpty(e))
sb.Append("<string />");
else
{
sb.Append("<string>");
sb.Append(e);
sb.Append("</string>");
}
return;
sb.Append(e);
}
public static void AddElem(Uri e, StringBuilder sb)
@@ -652,18 +648,13 @@ namespace OpenSim.Framework
public static void AddRawElem(string name, string e, StringBuilder sb)
{
if (String.IsNullOrEmpty(e))
return;
sb.Append("<key>");
sb.Append(name);
sb.Append("</key>");
if(String.IsNullOrEmpty(e))
sb.Append("<string />");
else
{
sb.Append("<string>");
sb.Append(e);
sb.Append("</string>");
}
sb.Append(e);
}
public static void AddElem(string name, Uri e, StringBuilder sb)
@@ -723,6 +714,14 @@ namespace OpenSim.Framework
sb.Append(e);
}
public static void AddLLSD(string name, string e, StringBuilder sb)
{
sb.Append("<key>");
sb.Append(name);
sb.Append("</key>");
sb.Append(e);
}
public static void EscapeToXML(string s, StringBuilder sb)
{
int i;