aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorTeravus Ovares2008-04-04 05:50:46 +0000
committerTeravus Ovares2008-04-04 05:50:46 +0000
commit75b192a2a0ae832f74a91f1a7b40d31eed5af50a (patch)
treeae2ae3e5e857beb4f54f2460418536396225c250 /OpenSim
parent* Fixes Region/Estate panel in current Linden Official client. (diff)
downloadopensim-SC_OLD-75b192a2a0ae832f74a91f1a7b40d31eed5af50a.zip
opensim-SC_OLD-75b192a2a0ae832f74a91f1a7b40d31eed5af50a.tar.gz
opensim-SC_OLD-75b192a2a0ae832f74a91f1a7b40d31eed5af50a.tar.bz2
opensim-SC_OLD-75b192a2a0ae832f74a91f1a7b40d31eed5af50a.tar.xz
* Fixing permissions on items returned via CAPS based inventory
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Framework/Communications/Capabilities/Caps.cs3
1 files changed, 2 insertions, 1 deletions
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
198 public string FetchInventoryRequest(string request, string path, string param) 198 public string FetchInventoryRequest(string request, string path, string param)
199 { 199 {
200 request = request.Replace("<llsd><map><key>folders</key><array>", "<llsd>"); 200 request = request.Replace("<llsd><map><key>folders</key><array>", "<llsd>");
201 request = request.Replace("\n", "");
201 request = request.Replace("</map></array></map>", "</map>"); 202 request = request.Replace("</map></array></map>", "</map>");
202 203
203 //Console.WriteLine("inventory request " + request); 204 //Console.WriteLine("inventory request " + request);
@@ -249,7 +250,7 @@ namespace OpenSim.Region.Capabilities
249 llsdItem.inv_type = Enum.GetName(typeof(InventoryType), invItem.invType).ToLower(); 250 llsdItem.inv_type = Enum.GetName(typeof(InventoryType), invItem.invType).ToLower();
250 llsdItem.permissions = new LLSDPermissions(); 251 llsdItem.permissions = new LLSDPermissions();
251 llsdItem.permissions.creator_id = invItem.creatorsID; 252 llsdItem.permissions.creator_id = invItem.creatorsID;
252 llsdItem.permissions.base_mask = (int)invItem.inventoryBasePermissions; 253 llsdItem.permissions.base_mask = (int)invItem.inventoryCurrentPermissions;
253 llsdItem.permissions.everyone_mask = (int)invItem.inventoryEveryOnePermissions; 254 llsdItem.permissions.everyone_mask = (int)invItem.inventoryEveryOnePermissions;
254 llsdItem.permissions.group_id = LLUUID.Zero; 255 llsdItem.permissions.group_id = LLUUID.Zero;
255 llsdItem.permissions.group_mask = 0; 256 llsdItem.permissions.group_mask = 0;