diff options
| author | Melanie | 2012-07-20 09:35:22 +0100 |
|---|---|---|
| committer | Melanie | 2012-07-20 09:35:22 +0100 |
| commit | df866fd300b94e43326e0b8e194055b5c6cf2afe (patch) | |
| tree | f84db3b1e03d14488eedb078546c3d174ff8857c /OpenSim/Region/OptionalModules | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Merge branch 'ubitwork' into avination (diff) | |
| download | opensim-SC_OLD-df866fd300b94e43326e0b8e194055b5c6cf2afe.zip opensim-SC_OLD-df866fd300b94e43326e0b8e194055b5c6cf2afe.tar.gz opensim-SC_OLD-df866fd300b94e43326e0b8e194055b5c6cf2afe.tar.bz2 opensim-SC_OLD-df866fd300b94e43326e0b8e194055b5c6cf2afe.tar.xz | |
Merge branch 'avination' into careminster
Diffstat (limited to 'OpenSim/Region/OptionalModules')
| -rw-r--r-- | OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs | 2 | ||||
| -rw-r--r-- | OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs index 17a210b..86f33eb 100644 --- a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs +++ b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs | |||
| @@ -1122,7 +1122,7 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server | |||
| 1122 | 1122 | ||
| 1123 | } | 1123 | } |
| 1124 | 1124 | ||
| 1125 | public void SendXferPacket(ulong xferID, uint packet, byte[] data) | 1125 | public void SendXferPacket(ulong xferID, uint packet, byte[] data, bool isTaskInventory) |
| 1126 | { | 1126 | { |
| 1127 | 1127 | ||
| 1128 | } | 1128 | } |
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs index 97db7e1..d00a6c0 100644 --- a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs +++ b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs | |||
| @@ -755,7 +755,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC | |||
| 755 | { | 755 | { |
| 756 | } | 756 | } |
| 757 | 757 | ||
| 758 | public virtual void SendXferPacket(ulong xferID, uint packet, byte[] data) | 758 | public virtual void SendXferPacket(ulong xferID, uint packet, byte[] data, bool isTaskInventory) |
| 759 | { | 759 | { |
| 760 | } | 760 | } |
| 761 | public virtual void SendAbortXferPacket(ulong xferID) | 761 | public virtual void SendAbortXferPacket(ulong xferID) |