aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared
diff options
context:
space:
mode:
authorHomer Horwitz2009-05-09 21:11:12 +0000
committerHomer Horwitz2009-05-09 21:11:12 +0000
commit1d234ca83f64b31b559ace3f63ebbba9f4903778 (patch)
tree887ba461d3ff20432806672786cbb82ff39b9aa4 /OpenSim/Region/ScriptEngine/Shared
parent* Code to make MRM debugging easier. (diff)
downloadopensim-SC_OLD-1d234ca83f64b31b559ace3f63ebbba9f4903778.zip
opensim-SC_OLD-1d234ca83f64b31b559ace3f63ebbba9f4903778.tar.gz
opensim-SC_OLD-1d234ca83f64b31b559ace3f63ebbba9f4903778.tar.bz2
opensim-SC_OLD-1d234ca83f64b31b559ace3f63ebbba9f4903778.tar.xz
Fixed handling of inventory a bit
- AssetType isn't InventoryType. Those enums contain different numbers. Use AssetType for the asset type, InventoryType for the inventory type. - The ToString method (or ToLower) of AssetType/InventoryType doesn't necessarily return the correct LLSD string. - Replaced several magic numbers by their corresponding enum. - Fixed the invType for gestures and animations in the library. This should fix Mantis #3610 and the non-terminating inventory loading
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index 1cd25e7..e5c59aa 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -1351,8 +1351,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1351 taskItem.CreationDate = (uint)Util.UnixTimeSinceEpoch(); 1351 taskItem.CreationDate = (uint)Util.UnixTimeSinceEpoch();
1352 taskItem.Name = asset.Name; 1352 taskItem.Name = asset.Name;
1353 taskItem.Description = asset.Description; 1353 taskItem.Description = asset.Description;
1354 taskItem.Type = 7; 1354 taskItem.Type = (int)AssetType.Notecard;
1355 taskItem.InvType = 7; 1355 taskItem.InvType = (int)InventoryType.Notecard;
1356 taskItem.OwnerID = m_host.OwnerID; 1356 taskItem.OwnerID = m_host.OwnerID;
1357 taskItem.CreatorID = m_host.OwnerID; 1357 taskItem.CreatorID = m_host.OwnerID;
1358 taskItem.BasePermissions = (uint)PermissionMask.All; 1358 taskItem.BasePermissions = (uint)PermissionMask.All;