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/Region/OptionalModules/Agent | |
| 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/Region/OptionalModules/Agent')
| -rw-r--r-- | OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs index 1660c45..f3382b2 100644 --- a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs +++ b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs | |||
| @@ -1100,7 +1100,12 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server | |||
| 1100 | 1100 | ||
| 1101 | public void SendInventoryItemCreateUpdate(InventoryItemBase Item, uint callbackId) | 1101 | public void SendInventoryItemCreateUpdate(InventoryItemBase Item, uint callbackId) |
| 1102 | { | 1102 | { |
| 1103 | 1103 | ||
| 1104 | } | ||
| 1105 | |||
| 1106 | public void SendInventoryItemCreateUpdate(InventoryItemBase Item, UUID transactionID, uint callbackId) | ||
| 1107 | { | ||
| 1108 | |||
| 1104 | } | 1109 | } |
| 1105 | 1110 | ||
| 1106 | public void SendRemoveInventoryItem(UUID itemID) | 1111 | public void SendRemoveInventoryItem(UUID itemID) |