diff options
author | Diva Canto | 2010-06-11 13:14:07 -0700 |
---|---|---|
committer | Diva Canto | 2010-06-11 13:14:07 -0700 |
commit | 5d099182c3ef563c112a22f2cda5c721214964b7 (patch) | |
tree | 2cf4b139bd866a134c5b45d3cca9c19b0b476540 /OpenSim/Region/CoreModules/Avatar/Inventory/Transfer | |
parent | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC_OLD-5d099182c3ef563c112a22f2cda5c721214964b7.zip opensim-SC_OLD-5d099182c3ef563c112a22f2cda5c721214964b7.tar.gz opensim-SC_OLD-5d099182c3ef563c112a22f2cda5c721214964b7.tar.bz2 opensim-SC_OLD-5d099182c3ef563c112a22f2cda5c721214964b7.tar.xz |
Reinstated the check on im.binaryBucket.Length, this time on the local handler for inventory offers.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs index c333812..2f1e9dd 100644 --- a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs | |||
@@ -154,17 +154,20 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer | |||
154 | private void OnInstantMessage(IClientAPI client, GridInstantMessage im) | 154 | private void OnInstantMessage(IClientAPI client, GridInstantMessage im) |
155 | { | 155 | { |
156 | m_log.InfoFormat("[INVENTORY TRANSFER]: OnInstantMessage {0}", im.dialog); | 156 | m_log.InfoFormat("[INVENTORY TRANSFER]: OnInstantMessage {0}", im.dialog); |
157 | |||
157 | Scene scene = FindClientScene(client.AgentId); | 158 | Scene scene = FindClientScene(client.AgentId); |
158 | 159 | ||
159 | if (scene == null) // Something seriously wrong here. | 160 | if (scene == null) // Something seriously wrong here. |
160 | return; | 161 | return; |
161 | 162 | ||
162 | 163 | ||
163 | |||
164 | if (im.dialog == (byte) InstantMessageDialog.InventoryOffered) | 164 | if (im.dialog == (byte) InstantMessageDialog.InventoryOffered) |
165 | { | 165 | { |
166 | //m_log.DebugFormat("Asset type {0}", ((AssetType)im.binaryBucket[0])); | 166 | //m_log.DebugFormat("Asset type {0}", ((AssetType)im.binaryBucket[0])); |
167 | 167 | ||
168 | if (im.binaryBucket.Length < 17) // Invalid | ||
169 | return; | ||
170 | |||
168 | UUID receipientID = new UUID(im.toAgentID); | 171 | UUID receipientID = new UUID(im.toAgentID); |
169 | ScenePresence user = scene.GetScenePresence(receipientID); | 172 | ScenePresence user = scene.GetScenePresence(receipientID); |
170 | UUID copyID; | 173 | UUID copyID; |
@@ -420,8 +423,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer | |||
420 | { | 423 | { |
421 | // Check if this is ours to handle | 424 | // Check if this is ours to handle |
422 | // | 425 | // |
423 | m_log.Info("OnGridInstantMessage"); | ||
424 | |||
425 | Scene scene = FindClientScene(new UUID(msg.toAgentID)); | 426 | Scene scene = FindClientScene(new UUID(msg.toAgentID)); |
426 | 427 | ||
427 | if (scene == null) | 428 | if (scene == null) |