diff options
| author | Melanie | 2012-09-27 17:29:44 +0100 |
|---|---|---|
| committer | Melanie | 2012-09-27 17:29:44 +0100 |
| commit | 001ec0e2e6f8c426af8f4a1c1eb9be4db066aea4 (patch) | |
| tree | 11170fddbd0f4c71c6f8288b5848442dfdc90d76 /OpenSim/Framework/IClientAPI.cs | |
| parent | Remove a core undo call that we don't need. (diff) | |
| parent | Merge branch 'ubitwork' into avination (diff) | |
| download | opensim-SC_OLD-001ec0e2e6f8c426af8f4a1c1eb9be4db066aea4.zip opensim-SC_OLD-001ec0e2e6f8c426af8f4a1c1eb9be4db066aea4.tar.gz opensim-SC_OLD-001ec0e2e6f8c426af8f4a1c1eb9be4db066aea4.tar.bz2 opensim-SC_OLD-001ec0e2e6f8c426af8f4a1c1eb9be4db066aea4.tar.xz | |
Merge branch 'avination' into careminster
Conflicts:
OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs
OpenSim/Region/Framework/Scenes/Scene.cs
Diffstat (limited to 'OpenSim/Framework/IClientAPI.cs')
| -rw-r--r-- | OpenSim/Framework/IClientAPI.cs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs index 91f36a5..4ae533e 100644 --- a/OpenSim/Framework/IClientAPI.cs +++ b/OpenSim/Framework/IClientAPI.cs | |||
| @@ -1171,6 +1171,7 @@ namespace OpenSim.Framework | |||
| 1171 | /// </summary> | 1171 | /// </summary> |
| 1172 | /// <param name="Item"></param> | 1172 | /// <param name="Item"></param> |
| 1173 | void SendInventoryItemCreateUpdate(InventoryItemBase Item, uint callbackId); | 1173 | void SendInventoryItemCreateUpdate(InventoryItemBase Item, uint callbackId); |
| 1174 | void SendInventoryItemCreateUpdate(InventoryItemBase Item, UUID transactionID, uint callbackId); | ||
| 1174 | 1175 | ||
| 1175 | void SendRemoveInventoryItem(UUID itemID); | 1176 | void SendRemoveInventoryItem(UUID itemID); |
| 1176 | 1177 | ||