aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Avatar/Assets
diff options
context:
space:
mode:
authorTeravus Ovares (Dan Olivares)2010-10-14 12:24:07 -0400
committerTeravus Ovares (Dan Olivares)2010-10-14 12:24:07 -0400
commit486eede9be9072b1104fa9f53121097aad5e8f19 (patch)
treee950f8bc75f40590b3a7e836982fc8ea6a195eb0 /OpenSim/Region/CoreModules/Avatar/Assets
parent* Replacing Magic numbers with Enums (diff)
parentDon't distroy attachments when using viewer 2.1+, strip multiple attachment data (diff)
downloadopensim-SC_OLD-486eede9be9072b1104fa9f53121097aad5e8f19.zip
opensim-SC_OLD-486eede9be9072b1104fa9f53121097aad5e8f19.tar.gz
opensim-SC_OLD-486eede9be9072b1104fa9f53121097aad5e8f19.tar.bz2
opensim-SC_OLD-486eede9be9072b1104fa9f53121097aad5e8f19.tar.xz
Merge branch 'master' of ssh://MyConnection/var/git/opensim
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/Assets')
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Assets/NewFileAgentInventoryVariablePriceModule.cs6
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Assets/NewFileAgentInventoryVariablePriceModule.cs b/OpenSim/Region/CoreModules/Avatar/Assets/NewFileAgentInventoryVariablePriceModule.cs
index 0d26036..af26b2b 100644
--- a/OpenSim/Region/CoreModules/Avatar/Assets/NewFileAgentInventoryVariablePriceModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Assets/NewFileAgentInventoryVariablePriceModule.cs
@@ -254,10 +254,10 @@ namespace OpenSim.Region.CoreModules.Avatar.Assets
254 item.AssetType = assType; 254 item.AssetType = assType;
255 item.InvType = inType; 255 item.InvType = inType;
256 item.Folder = parentFolder; 256 item.Folder = parentFolder;
257 item.CurrentPermissions = 2147483647; 257 item.CurrentPermissions = (uint)PermissionMask.All;
258 item.BasePermissions = 2147483647; 258 item.BasePermissions = (uint)PermissionMask.All;
259 item.EveryOnePermissions = 0; 259 item.EveryOnePermissions = 0;
260 item.NextPermissions = 2147483647; 260 item.NextPermissions = (uint)(PermissionMask.Move | PermissionMask.Modify | PermissionMask.Transfer);
261 item.CreationDate = Util.UnixTimeSinceEpoch(); 261 item.CreationDate = Util.UnixTimeSinceEpoch();
262 m_scene.AddInventoryItem(item); 262 m_scene.AddInventoryItem(item);
263 263