diff options
| author | Melanie | 2010-10-14 11:08:10 +0100 |
|---|---|---|
| committer | Melanie | 2010-10-14 16:28:51 +0100 |
| commit | ba247f729d80dbc01b1cc13cc46692691b4b4cb3 (patch) | |
| tree | 919cf041d71a43735c4b46ea6bd9f4f5b94265af /OpenSim | |
| parent | Added manual xml2 serialization. Rewired only save xml2, not oars yet. Seems ... (diff) | |
| download | opensim-SC_OLD-ba247f729d80dbc01b1cc13cc46692691b4b4cb3.zip opensim-SC_OLD-ba247f729d80dbc01b1cc13cc46692691b4b4cb3.tar.gz opensim-SC_OLD-ba247f729d80dbc01b1cc13cc46692691b4b4cb3.tar.bz2 opensim-SC_OLD-ba247f729d80dbc01b1cc13cc46692691b4b4cb3.tar.xz | |
Kill some magic numbers in the mesh upload module and change the mesh asset
type from 45 to 49 to match OMV trunk
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Assets/NewFileAgentInventoryVariablePriceModule.cs | 6 |
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 35f054f..d644cdd 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 | ||