aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Capabilities/Handlers/FetchInventory2/FetchInventory2Handler.cs
diff options
context:
space:
mode:
authorUbitUmarov2013-05-31 23:18:12 +0100
committerUbitUmarov2013-05-31 23:18:12 +0100
commit8fe2308afcd31abd1c0110fc44e78497ad66c231 (patch)
treeeba6510acf2087229b53261f80229467df8d1865 /OpenSim/Capabilities/Handlers/FetchInventory2/FetchInventory2Handler.cs
parentretouch prim stopped condition test (diff)
parentFix multi-wear of alpha and tattoo layers. (diff)
downloadopensim-SC-8fe2308afcd31abd1c0110fc44e78497ad66c231.zip
opensim-SC-8fe2308afcd31abd1c0110fc44e78497ad66c231.tar.gz
opensim-SC-8fe2308afcd31abd1c0110fc44e78497ad66c231.tar.bz2
opensim-SC-8fe2308afcd31abd1c0110fc44e78497ad66c231.tar.xz
Merge branch 'avination-current' into ubitwork
Diffstat (limited to 'OpenSim/Capabilities/Handlers/FetchInventory2/FetchInventory2Handler.cs')
-rw-r--r--OpenSim/Capabilities/Handlers/FetchInventory2/FetchInventory2Handler.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Capabilities/Handlers/FetchInventory2/FetchInventory2Handler.cs b/OpenSim/Capabilities/Handlers/FetchInventory2/FetchInventory2Handler.cs
index c0ca1e1..c305797 100644
--- a/OpenSim/Capabilities/Handlers/FetchInventory2/FetchInventory2Handler.cs
+++ b/OpenSim/Capabilities/Handlers/FetchInventory2/FetchInventory2Handler.cs
@@ -97,7 +97,7 @@ namespace OpenSim.Capabilities.Handlers
97 llsdItem.asset_id = invItem.AssetID; 97 llsdItem.asset_id = invItem.AssetID;
98 llsdItem.created_at = invItem.CreationDate; 98 llsdItem.created_at = invItem.CreationDate;
99 llsdItem.desc = invItem.Description; 99 llsdItem.desc = invItem.Description;
100 llsdItem.flags = (int)invItem.Flags; 100 llsdItem.flags = ((int)invItem.Flags) & 0xff;
101 llsdItem.item_id = invItem.ID; 101 llsdItem.item_id = invItem.ID;
102 llsdItem.name = invItem.Name; 102 llsdItem.name = invItem.Name;
103 llsdItem.parent_id = invItem.Folder; 103 llsdItem.parent_id = invItem.Folder;