1 files changed, 117 insertions, 100 deletions

diff --git a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
index 6f5775a..b8d423f 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
@@ -503,7 +503,6 @@ namespace OpenSim.Region.ClientStack.Linden
                         errorResponse.state = "error";
                         errorResponse.error = resperror;
                         return errorResponse;
-                        break;
                     case FileAgentInventoryState.waitUpload:
                         // todo stop current uploader server
                         break;
@@ -1377,30 +1376,37 @@ namespace OpenSim.Region.ClientStack.Linden
                 IOSHttpResponse httpResponse)
         {
             OSDMap req = (OSDMap)OSDParser.DeserializeLLSDXml(request);
-            OSDMap resp = new OSDMap();
             OSDArray object_ids = (OSDArray)req["object_ids"];
 
-            for (int i = 0 ; i < object_ids.Count ; i++)
+            StringBuilder lsl = LLSDxmlEncode.Start();
+            
+            if(object_ids.Count == 0)
+                LLSDxmlEncode.AddEmptyMap(lsl);
+            else
             {
-                UUID uuid = object_ids[i].AsUUID();
-
-                SceneObjectPart obj = m_Scene.GetSceneObjectPart(uuid);
-                if (obj != null)
+                LLSDxmlEncode.AddMap(lsl);
+                for (int i = 0 ; i < object_ids.Count ; i++)
                 {
-                    OSDMap object_data = new OSDMap();
+                    UUID uuid = object_ids[i].AsUUID();
+
+                    SceneObjectPart obj = m_Scene.GetSceneObjectPart(uuid);
+                    if (obj != null)
+                    {                  
+                        LLSDxmlEncode.AddMap(uuid.ToString(),lsl);
 
-                    object_data["PhysicsShapeType"] = obj.PhysicsShapeType;
-                    object_data["Density"] = obj.Density;
-                    object_data["Friction"] = obj.Friction;
-                    object_data["Restitution"] = obj.Restitution;
-                    object_data["GravityMultiplier"] = obj.GravityModifier;
+                        LLSDxmlEncode.AddElem("PhysicsShapeType", obj.PhysicsShapeType, lsl);
+                        LLSDxmlEncode.AddElem("Density", obj.Density, lsl);
+                        LLSDxmlEncode.AddElem("Friction", obj.Friction, lsl);
+                        LLSDxmlEncode.AddElem("Restitution", obj.Restitution, lsl);
+                        LLSDxmlEncode.AddElem("GravityMultiplier", obj.GravityModifier, lsl);
 
-                    resp[uuid.ToString()] = object_data;
+                        LLSDxmlEncode.AddEndMap(lsl);
+                    }
+                LLSDxmlEncode.AddEndMap(lsl);
                 }
             }
-
-            string response = OSDParser.SerializeLLSDXmlString(resp);
-            return response;
+            
+            return LLSDxmlEncode.End(lsl);
         }
 
         public string GetObjectCost(string request, string path,
@@ -1408,47 +1414,59 @@ namespace OpenSim.Region.ClientStack.Linden
                 IOSHttpResponse httpResponse)
         {
             OSDMap req = (OSDMap)OSDParser.DeserializeLLSDXml(request);
-            OSDMap resp = new OSDMap();
-
             OSDArray object_ids = (OSDArray)req["object_ids"];
 
-            for (int i = 0; i < object_ids.Count; i++)
+            StringBuilder lsl = LLSDxmlEncode.Start(512);
+            
+            if(object_ids.Count == 0)
+                LLSDxmlEncode.AddEmptyMap(lsl);
+            else
             {
-                UUID uuid = object_ids[i].AsUUID();
+                bool haveone = false;
+                LLSDxmlEncode.AddMap(lsl);
+                for (int i = 0; i < object_ids.Count; i++)
+                {
+                    UUID uuid = object_ids[i].AsUUID();
 
-                SceneObjectPart part = m_Scene.GetSceneObjectPart(uuid);
-                SceneObjectGroup grp = null;
-                if (part != null)
-                    grp = part.ParentGroup;
-                if (grp != null)
+                    SceneObjectPart part = m_Scene.GetSceneObjectPart(uuid);
+                    SceneObjectGroup grp = null;
+                    if (part != null)
+                        grp = part.ParentGroup;
+                    if (grp != null)
+                    {
+                        haveone = true;
+                        float linksetCost;
+                        float linksetPhysCost;
+                        float partCost;
+                        float partPhysCost;
+
+                        grp.GetResourcesCosts(part,out linksetCost,out linksetPhysCost,out partCost,out partPhysCost);
+
+                        LLSDxmlEncode.AddMap(uuid.ToString(), lsl);
+
+                        LLSDxmlEncode.AddElem("linked_set_resource_cost", linksetCost, lsl);
+                        LLSDxmlEncode.AddElem("resource_cost", partCost, lsl);
+                        LLSDxmlEncode.AddElem("physics_cost", partPhysCost, lsl);
+                        LLSDxmlEncode.AddElem("linked_set_physics_cost", linksetPhysCost, lsl);
+                        LLSDxmlEncode.AddElem("resource_limiting_type", "legacy", lsl);
+
+                        LLSDxmlEncode.AddEndMap(lsl);
+                    }
+                }
+                if(!haveone)
                 {
-                    float linksetCost;
-                    float linksetPhysCost;
-                    float partCost;
-                    float partPhysCost;
-
-                    grp.GetResourcesCosts(part,out linksetCost,out linksetPhysCost,out partCost,out partPhysCost);
-
-                    OSDMap object_data = new OSDMap();
-                    object_data["linked_set_resource_cost"] = linksetCost;
-                    object_data["resource_cost"] = partCost;
-                    object_data["physics_cost"] = partPhysCost;
-                    object_data["linked_set_physics_cost"] = linksetPhysCost;
-                    object_data["resource_limiting_type"] = "legacy";
-                    resp[uuid.ToString()] = object_data;
+                    LLSDxmlEncode.AddMap(UUID.Zero.ToString(), lsl);
+                    LLSDxmlEncode.AddElem("linked_set_resource_cost", 0, lsl);
+                    LLSDxmlEncode.AddElem("resource_cost", 0, lsl);
+                    LLSDxmlEncode.AddElem("physics_cost", 0, lsl);
+                    LLSDxmlEncode.AddElem("linked_set_physics_cost", 0, lsl);
+                    LLSDxmlEncode.AddElem("resource_limiting_type", "legacy", lsl);
+                    LLSDxmlEncode.AddEndMap(lsl);
                 }
+                LLSDxmlEncode.AddEndMap(lsl);
             }
-            if(resp.Count == 0)
-            {
-                OSDMap object_data = new OSDMap();
-                object_data["linked_set_resource_cost"] = 0;
-                object_data["resource_cost"] = 0;
-                object_data["physics_cost"] = 0;
-                object_data["linked_set_physics_cost"] = 0;
-                resp[UUID.Zero.ToString()] = object_data;
-            }
-            string response = OSDParser.SerializeLLSDXmlString(resp);
-            return response;
+                
+            return LLSDxmlEncode.End(lsl);
         }
 
         public string ResourceCostSelected(string request, string path,
@@ -1456,8 +1474,6 @@ namespace OpenSim.Region.ClientStack.Linden
                 IOSHttpResponse httpResponse)
         {
             OSDMap req = (OSDMap)OSDParser.DeserializeLLSDXml(request);
-            OSDMap resp = new OSDMap();
-
 
             float phys=0;
             float stream=0;
@@ -1508,16 +1524,21 @@ namespace OpenSim.Region.ClientStack.Linden
                 }
             }
 
-            OSDMap object_data = new OSDMap();
+            StringBuilder lsl = LLSDxmlEncode.Start();
+            LLSDxmlEncode.AddMap(lsl);
+
+            LLSDxmlEncode.AddMap("selected", lsl);
 
-            object_data["physics"] = phys;
-            object_data["streaming"] = stream;
-            object_data["simulation"] = simul;
+            LLSDxmlEncode.AddElem("physics", phys, lsl);
+            LLSDxmlEncode.AddElem("streaming", stream, lsl);
+            LLSDxmlEncode.AddElem("simulation", simul, lsl);
 
-            resp["selected"] = object_data;
+            LLSDxmlEncode.AddEndMap(lsl);
+            LLSDxmlEncode.AddEndMap(lsl);
+          
 //            resp["transaction_id"] = "undef";
-            string response = OSDParser.SerializeLLSDXmlString(resp);
-            return response;
+            return LLSDxmlEncode.End(lsl);
+
         }
 
         public string UpdateAgentInformation(string request, string path,
@@ -1820,57 +1841,53 @@ namespace OpenSim.Region.ClientStack.Linden
                 return "";
             }
 
+            // Full content request
+            httpResponse.StatusCode = (int)System.Net.HttpStatusCode.OK;
+            //httpResponse.ContentLength = ??;
+            httpResponse.ContentType = "application/llsd+xml";
+
             NameValueCollection query = HttpUtility.ParseQueryString(httpRequest.Url.Query);
             string[] ids = query.GetValues("ids");
 
             Dictionary<UUID,string> names = m_UserManager.GetUsersNames(ids);
 
-            OSDMap osdReply = new OSDMap();
-            OSDArray agents = new OSDArray();
-
-            osdReply["agents"] = agents;
-            foreach (KeyValuePair<UUID,string> kvp in names)
+            StringBuilder lsl = LLSDxmlEncode.Start(names.Count * 256 + 256);
+            LLSDxmlEncode.AddMap(lsl);
+            if(names.Count == 0)
+                LLSDxmlEncode.AddEmptyArray("agents", lsl);
+            else
             {
-                if (string.IsNullOrEmpty(kvp.Value))
-                    continue;
-                if(kvp.Key == UUID.Zero)
-                    continue;
+                LLSDxmlEncode.AddArray("agents", lsl);
+
+                foreach (KeyValuePair<UUID,string> kvp in names)
+                {
+                    if (string.IsNullOrEmpty(kvp.Value))
+                        continue;
+                    if(kvp.Key == UUID.Zero)
+                        continue;
 
-                string[] parts = kvp.Value.Split(new char[] {' '});
-                OSDMap osdname = new OSDMap();
+                    string[] parts = kvp.Value.Split(new char[] {' '});
 
                 // dont tell about unknown users, we can't send them back on Bad either
-                if(parts[0] == "Unknown")
-                     continue;
-/*
-                if(parts[0] == "Unknown")
-                {
-                    osdname["display_name_next_update"] = OSD.FromDate(DateTime.UtcNow.AddHours(1));
-                    osdname["display_name_expires"] = OSD.FromDate(DateTime.UtcNow.AddHours(2));
+                    if(parts[0] == "Unknown")
+                         continue;
+
+                    LLSDxmlEncode.AddMap(lsl);
+                    LLSDxmlEncode.AddElem("display_name_next_update", DateTime.UtcNow.AddDays(8), lsl);
+                    LLSDxmlEncode.AddElem("display_name_expires", DateTime.UtcNow.AddMonths(1), lsl);
+                    LLSDxmlEncode.AddElem("display_name", kvp.Value, lsl);
+                    LLSDxmlEncode.AddElem("legacy_first_name", parts[0], lsl);
+                    LLSDxmlEncode.AddElem("legacy_last_name", parts[1], lsl);
+                    LLSDxmlEncode.AddElem("username", kvp.Value, lsl);
+                    LLSDxmlEncode.AddElem("id", kvp.Key, lsl);
+                    LLSDxmlEncode.AddElem("is_display_name_default", true, lsl);
+                    LLSDxmlEncode.AddEndMap(lsl);
                 }
-                else
-*/
-                {
-                    osdname["display_name_next_update"] = OSD.FromDate(DateTime.UtcNow.AddDays(8));
-                    osdname["display_name_expires"] = OSD.FromDate(DateTime.UtcNow.AddMonths(1));
-                }
-                osdname["display_name"] = OSD.FromString(kvp.Value);
-                osdname["legacy_first_name"] = parts[0];
-                osdname["legacy_last_name"] = parts[1];
-                osdname["username"] = OSD.FromString(kvp.Value);
-                osdname["id"] = OSD.FromUUID(kvp.Key);
-                osdname["is_display_name_default"] = OSD.FromBoolean(true);
-
-                agents.Add(osdname);
+                LLSDxmlEncode.AddEndArray(lsl);
             }
-
-            // Full content request
-            httpResponse.StatusCode = (int)System.Net.HttpStatusCode.OK;
-            //httpResponse.ContentLength = ??;
-            httpResponse.ContentType = "application/llsd+xml";
-
-            string reply = OSDParser.SerializeLLSDXmlString(osdReply);
-            return reply;
+        
+            LLSDxmlEncode.AddEndMap(lsl);
+            return LLSDxmlEncode.End(lsl);;
         }
     }