aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-07-23 02:18:23 +0100
committerJustin Clark-Casey (justincc)2011-07-23 02:18:23 +0100
commitbe9b4ad23abcb2dec2291679c758f0dc0bc6096e (patch)
tree369414b03405536b3b75cac74da7670dea727257
parentRemove manually permissions settings on all current library items so that the... (diff)
downloadopensim-SC_OLD-be9b4ad23abcb2dec2291679c758f0dc0bc6096e.zip
opensim-SC_OLD-be9b4ad23abcb2dec2291679c758f0dc0bc6096e.tar.gz
opensim-SC_OLD-be9b4ad23abcb2dec2291679c758f0dc0bc6096e.tar.bz2
opensim-SC_OLD-be9b4ad23abcb2dec2291679c758f0dc0bc6096e.tar.xz
For default everyone permissions on library items, make notecards and scripts non-modifiable (but still copyable, etc).
Users should not be given the impression that they can modify these items. This still does not solve the issue where library items cannot be dragged into prims or user inventory any time after they are initially seen. Curiously, manually copying and pasting still appears to work. On the surface, this seems to have something to do with library item caching on the client, since deleting the cache allows drag to work again once Not sure what the exact problem is.
-rw-r--r--OpenSim/Region/CoreModules/Framework/Library/LibraryModule.cs12
-rw-r--r--OpenSim/Services/InventoryService/LibraryService.cs3
2 files changed, 6 insertions, 9 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/Library/LibraryModule.cs b/OpenSim/Region/CoreModules/Framework/Library/LibraryModule.cs
index 2ef4457..3155ce7 100644
--- a/OpenSim/Region/CoreModules/Framework/Library/LibraryModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/Library/LibraryModule.cs
@@ -207,14 +207,10 @@ namespace OpenSim.Region.CoreModules.Framework.Library
207 if (node is InventoryItemBase) 207 if (node is InventoryItemBase)
208 { 208 {
209 InventoryItemBase item = (InventoryItemBase)node; 209 InventoryItemBase item = (InventoryItemBase)node;
210// item.BasePermissions = (uint)PermissionMask.All; 210 item.BasePermissions = (uint)PermissionMask.All;
211 item.BasePermissions = 0x7FFFFFFF; 211 item.EveryOnePermissions = (uint)PermissionMask.All - (uint)PermissionMask.Modify;
212 item.EveryOnePermissions = 0x7FFFFFFF; 212 item.CurrentPermissions = (uint)PermissionMask.All;
213 item.CurrentPermissions = 0x7FFFFFFF; 213 item.NextPermissions = (uint)PermissionMask.All;
214 item.NextPermissions = 0x7FFFFFFF;
215// item.EveryOnePermissions = (uint)PermissionMask.Copy;
216// item.CurrentPermissions = (uint)PermissionMask.None;
217// item.NextPermissions = (uint)PermissionMask.All;
218 } 214 }
219 } 215 }
220 216
diff --git a/OpenSim/Services/InventoryService/LibraryService.cs b/OpenSim/Services/InventoryService/LibraryService.cs
index 2e9d2b1..f90895b 100644
--- a/OpenSim/Services/InventoryService/LibraryService.cs
+++ b/OpenSim/Services/InventoryService/LibraryService.cs
@@ -195,7 +195,8 @@ namespace OpenSim.Services.InventoryService
195 item.AssetType = config.GetInt("assetType", item.InvType); 195 item.AssetType = config.GetInt("assetType", item.InvType);
196 item.CurrentPermissions = (uint)config.GetLong("currentPermissions", (uint)PermissionMask.All); 196 item.CurrentPermissions = (uint)config.GetLong("currentPermissions", (uint)PermissionMask.All);
197 item.NextPermissions = (uint)config.GetLong("nextPermissions", (uint)PermissionMask.All); 197 item.NextPermissions = (uint)config.GetLong("nextPermissions", (uint)PermissionMask.All);
198 item.EveryOnePermissions = (uint)config.GetLong("everyonePermissions", (uint)PermissionMask.All); 198 item.EveryOnePermissions
199 = (uint)config.GetLong("everyonePermissions", (uint)PermissionMask.All - (uint)PermissionMask.Modify);
199 item.BasePermissions = (uint)config.GetLong("basePermissions", (uint)PermissionMask.All); 200 item.BasePermissions = (uint)config.GetLong("basePermissions", (uint)PermissionMask.All);
200 item.Flags = (uint)config.GetInt("flags", 0); 201 item.Flags = (uint)config.GetInt("flags", 0);
201 202