diff options
| author | UbitUmarov | 2015-09-01 14:54:35 +0100 |
|---|---|---|
| committer | UbitUmarov | 2015-09-01 14:54:35 +0100 |
| commit | 371c9dd2af01a2e7422ec901ee1f80757284a78c (patch) | |
| tree | 058d2a513cacb12efcce0c0df0ae14ad135dbfe2 /OpenSim/Capabilities/Handlers/FetchInventory | |
| parent | remove lixo (diff) | |
| parent | dont change camera on crossings (diff) | |
| download | opensim-SC_OLD-371c9dd2af01a2e7422ec901ee1f80757284a78c.zip opensim-SC_OLD-371c9dd2af01a2e7422ec901ee1f80757284a78c.tar.gz opensim-SC_OLD-371c9dd2af01a2e7422ec901ee1f80757284a78c.tar.bz2 opensim-SC_OLD-371c9dd2af01a2e7422ec901ee1f80757284a78c.tar.xz | |
bad merge?
Diffstat (limited to 'OpenSim/Capabilities/Handlers/FetchInventory')
| -rw-r--r-- | OpenSim/Capabilities/Handlers/FetchInventory/FetchInventory2Handler.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Capabilities/Handlers/FetchInventory/FetchInventory2Handler.cs b/OpenSim/Capabilities/Handlers/FetchInventory/FetchInventory2Handler.cs index c904392..638e8bc 100644 --- a/OpenSim/Capabilities/Handlers/FetchInventory/FetchInventory2Handler.cs +++ b/OpenSim/Capabilities/Handlers/FetchInventory/FetchInventory2Handler.cs | |||
| @@ -114,7 +114,7 @@ namespace OpenSim.Capabilities.Handlers | |||
| 114 | llsdItem.asset_id = invItem.AssetID; | 114 | llsdItem.asset_id = invItem.AssetID; |
| 115 | llsdItem.created_at = invItem.CreationDate; | 115 | llsdItem.created_at = invItem.CreationDate; |
| 116 | llsdItem.desc = invItem.Description; | 116 | llsdItem.desc = invItem.Description; |
| 117 | llsdItem.flags = (int)invItem.Flags; | 117 | llsdItem.flags = ((int)invItem.Flags) & 0xff; |
| 118 | llsdItem.item_id = invItem.ID; | 118 | llsdItem.item_id = invItem.ID; |
| 119 | llsdItem.name = invItem.Name; | 119 | llsdItem.name = invItem.Name; |
| 120 | llsdItem.parent_id = invItem.Folder; | 120 | llsdItem.parent_id = invItem.Folder; |