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

2 files changed, 20 insertions, 16 deletions

diff --git a/OpenSim/Framework/EstateBan.cs b/OpenSim/Framework/EstateBan.cs
index 12a92bb..81a56d7 100644
--- a/OpenSim/Framework/EstateBan.cs
+++ b/OpenSim/Framework/EstateBan.cs
@@ -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);
             }
         }
 
diff --git a/OpenSim/Framework/LLSDxmlEncode.cs b/OpenSim/Framework/LLSDxmlEncode.cs
index ac9b468..97b3ca1 100644
--- a/OpenSim/Framework/LLSDxmlEncode.cs
+++ b/OpenSim/Framework/LLSDxmlEncode.cs
@@ -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;