diff options
author | Adam Frisby | 2008-11-08 17:20:54 +0000 |
---|---|---|
committer | Adam Frisby | 2008-11-08 17:20:54 +0000 |
commit | cf0a14bec94322656f57890d49fead85ed31730e (patch) | |
tree | 861596444093bb68567cda8583cd0e94a618c120 /OpenSim/Region/Environment/Modules/Avatar/Inventory | |
parent | Fix broken build since r7179 (diff) | |
download | opensim-SC_OLD-cf0a14bec94322656f57890d49fead85ed31730e.zip opensim-SC_OLD-cf0a14bec94322656f57890d49fead85ed31730e.tar.gz opensim-SC_OLD-cf0a14bec94322656f57890d49fead85ed31730e.tar.bz2 opensim-SC_OLD-cf0a14bec94322656f57890d49fead85ed31730e.tar.xz |
* Added IClientIM to IClientCore interfaces
* Changed SendInstantMessage, dropped fromAgentSession and imSessionID as security precaution, see http://opensimulator.org/wiki/OpenSim_0.6_IClientAPI#Porting_Guide for details on porting.
* Removed unused usings from Framework.*
Diffstat (limited to 'OpenSim/Region/Environment/Modules/Avatar/Inventory')
-rw-r--r-- | OpenSim/Region/Environment/Modules/Avatar/Inventory/Transfer/InventoryTransferModule.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Inventory/Transfer/InventoryTransferModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Inventory/Transfer/InventoryTransferModule.cs index a07fc5f..d8b203f 100644 --- a/OpenSim/Region/Environment/Modules/Avatar/Inventory/Transfer/InventoryTransferModule.cs +++ b/OpenSim/Region/Environment/Modules/Avatar/Inventory/Transfer/InventoryTransferModule.cs | |||
@@ -135,7 +135,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Inventory.Transfer | |||
135 | m_pendingOffers[imSessionID] = itemId; | 135 | m_pendingOffers[imSessionID] = itemId; |
136 | 136 | ||
137 | user.ControllingClient.SendInstantMessage( | 137 | user.ControllingClient.SendInstantMessage( |
138 | fromAgentID, fromAgentSession, message, toAgentID, imSessionID, fromAgentName, | 138 | fromAgentID, message, toAgentID, fromAgentName, |
139 | dialog, timestamp, false, binaryBucket); | 139 | dialog, timestamp, false, binaryBucket); |
140 | 140 | ||
141 | return; | 141 | return; |
@@ -167,7 +167,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Inventory.Transfer | |||
167 | if (!user.IsChildAgent) | 167 | if (!user.IsChildAgent) |
168 | { | 168 | { |
169 | user.ControllingClient.SendInstantMessage( | 169 | user.ControllingClient.SendInstantMessage( |
170 | fromAgentID, fromAgentSession, message, toAgentID, imSessionID, fromAgentName, | 170 | fromAgentID, message, toAgentID, fromAgentName, |
171 | dialog, timestamp, false, binaryBucket); | 171 | dialog, timestamp, false, binaryBucket); |
172 | 172 | ||
173 | if (m_pendingOffers.ContainsKey(imSessionID)) | 173 | if (m_pendingOffers.ContainsKey(imSessionID)) |
@@ -213,7 +213,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Inventory.Transfer | |||
213 | if (!user.IsChildAgent) | 213 | if (!user.IsChildAgent) |
214 | { | 214 | { |
215 | user.ControllingClient.SendInstantMessage( | 215 | user.ControllingClient.SendInstantMessage( |
216 | fromAgentID, fromAgentSession, message, toAgentID, imSessionID, fromAgentName, | 216 | fromAgentID, message, toAgentID, fromAgentName, |
217 | dialog, timestamp, false, binaryBucket); | 217 | dialog, timestamp, false, binaryBucket); |
218 | 218 | ||
219 | if (m_pendingOffers.ContainsKey(imSessionID)) | 219 | if (m_pendingOffers.ContainsKey(imSessionID)) |