diff options
| author | Melanie | 2013-06-06 03:20:15 +0100 |
|---|---|---|
| committer | Melanie | 2013-06-06 03:20:15 +0100 |
| commit | fe4a67efb6f54cad3f00884712abe03704216421 (patch) | |
| tree | 04de93aaa8e9430c7c33e15912b3683b0297a10a /OpenSim/Capabilities | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Update HTTP server (diff) | |
| download | opensim-SC_OLD-fe4a67efb6f54cad3f00884712abe03704216421.zip opensim-SC_OLD-fe4a67efb6f54cad3f00884712abe03704216421.tar.gz opensim-SC_OLD-fe4a67efb6f54cad3f00884712abe03704216421.tar.bz2 opensim-SC_OLD-fe4a67efb6f54cad3f00884712abe03704216421.tar.xz | |
Merge branch 'avination-current' into careminster
Conflicts:
OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
OpenSim/Region/Framework/Interfaces/IDynamicMenuModule.cs
OpenSim/Region/OptionalModules/ViewerSupport/DynamicMenuModule.cs
OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
Diffstat (limited to 'OpenSim/Capabilities')
| -rw-r--r-- | OpenSim/Capabilities/Handlers/FetchInventory2/FetchInventory2Handler.cs | 2 | ||||
| -rw-r--r-- | OpenSim/Capabilities/Handlers/WebFetchInventoryDescendents/WebFetchInvDescHandler.cs | 2 |
2 files changed, 2 insertions, 2 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; |
diff --git a/OpenSim/Capabilities/Handlers/WebFetchInventoryDescendents/WebFetchInvDescHandler.cs b/OpenSim/Capabilities/Handlers/WebFetchInventoryDescendents/WebFetchInvDescHandler.cs index 11a2698..16e2f2d 100644 --- a/OpenSim/Capabilities/Handlers/WebFetchInventoryDescendents/WebFetchInvDescHandler.cs +++ b/OpenSim/Capabilities/Handlers/WebFetchInventoryDescendents/WebFetchInvDescHandler.cs | |||
| @@ -411,7 +411,7 @@ namespace OpenSim.Capabilities.Handlers | |||
| 411 | llsdItem.asset_id = invItem.AssetID; | 411 | llsdItem.asset_id = invItem.AssetID; |
| 412 | llsdItem.created_at = invItem.CreationDate; | 412 | llsdItem.created_at = invItem.CreationDate; |
| 413 | llsdItem.desc = invItem.Description; | 413 | llsdItem.desc = invItem.Description; |
| 414 | llsdItem.flags = (int)invItem.Flags; | 414 | llsdItem.flags = ((int)invItem.Flags) & 0xff; |
| 415 | llsdItem.item_id = invItem.ID; | 415 | llsdItem.item_id = invItem.ID; |
| 416 | llsdItem.name = invItem.Name; | 416 | llsdItem.name = invItem.Name; |
| 417 | llsdItem.parent_id = invItem.Folder; | 417 | llsdItem.parent_id = invItem.Folder; |