diff options
| author | Sean McNamara | 2011-02-28 15:08:35 -0500 |
|---|---|---|
| committer | Sean McNamara | 2011-02-28 15:08:35 -0500 |
| commit | 60989521a6a60bb5610784936797df0683a55527 (patch) | |
| tree | 51fd99afe41459221ff74a78be965001ff680df9 /OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |
| parent | Fix small bug with remove region; update settings docs. (diff) | |
| parent | Fix a few little things (diff) | |
| download | opensim-SC_OLD-60989521a6a60bb5610784936797df0683a55527.zip opensim-SC_OLD-60989521a6a60bb5610784936797df0683a55527.tar.gz opensim-SC_OLD-60989521a6a60bb5610784936797df0683a55527.tar.bz2 opensim-SC_OLD-60989521a6a60bb5610784936797df0683a55527.tar.xz | |
Merge git://opensimulator.org/git/opensim
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.Inventory.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs index e2d96d9..fcbcf59 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |||
| @@ -321,6 +321,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 321 | // Passing something to another avatar or a an object will already | 321 | // Passing something to another avatar or a an object will already |
| 322 | InventoryItemBase item = new InventoryItemBase(itemID, remoteClient.AgentId); | 322 | InventoryItemBase item = new InventoryItemBase(itemID, remoteClient.AgentId); |
| 323 | item = InventoryService.GetItem(item); | 323 | item = InventoryService.GetItem(item); |
| 324 | if (item.Owner != remoteClient.AgentId) | ||
| 325 | return; | ||
| 324 | 326 | ||
| 325 | if (item != null) | 327 | if (item != null) |
| 326 | { | 328 | { |