From 75b192a2a0ae832f74a91f1a7b40d31eed5af50a Mon Sep 17 00:00:00 2001
From: Teravus Ovares
Date: Fri, 4 Apr 2008 05:50:46 +0000
Subject: * Fixing permissions on items returned via CAPS based inventory

---
 OpenSim/Framework/Communications/Capabilities/Caps.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'OpenSim')

diff --git a/OpenSim/Framework/Communications/Capabilities/Caps.cs b/OpenSim/Framework/Communications/Capabilities/Caps.cs
index 886ca49..6e78452 100644
--- a/OpenSim/Framework/Communications/Capabilities/Caps.cs
+++ b/OpenSim/Framework/Communications/Capabilities/Caps.cs
@@ -198,6 +198,7 @@ namespace OpenSim.Region.Capabilities
         public string FetchInventoryRequest(string request, string path, string param)
         {
             request = request.Replace("<llsd><map><key>folders</key><array>", "<llsd>");
+            request = request.Replace("\n", "");
             request = request.Replace("</map></array></map>", "</map>");
 
             //Console.WriteLine("inventory request " + request);
@@ -249,7 +250,7 @@ namespace OpenSim.Region.Capabilities
             llsdItem.inv_type = Enum.GetName(typeof(InventoryType), invItem.invType).ToLower();
             llsdItem.permissions = new LLSDPermissions();
             llsdItem.permissions.creator_id = invItem.creatorsID;
-            llsdItem.permissions.base_mask = (int)invItem.inventoryBasePermissions;
+            llsdItem.permissions.base_mask = (int)invItem.inventoryCurrentPermissions;
             llsdItem.permissions.everyone_mask = (int)invItem.inventoryEveryOnePermissions;
             llsdItem.permissions.group_id = LLUUID.Zero;
             llsdItem.permissions.group_mask = 0;
-- 
cgit v1.1