diff options
| author | Justin Clark-Casey (justincc) | 2012-09-24 22:52:33 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2012-09-24 22:52:33 +0100 |
| commit | ac02cadbdb817f0a8ab913bfd67f2f8919cdd69f (patch) | |
| tree | f0fca1b7c047760a0927441840e7709ff91e7fb5 /OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs | |
| parent | Documenting LSL script-related events (diff) | |
| parent | HG Rez object: warn the user if the item or asset cannot be found. (diff) | |
| download | opensim-SC-ac02cadbdb817f0a8ab913bfd67f2f8919cdd69f.zip opensim-SC-ac02cadbdb817f0a8ab913bfd67f2f8919cdd69f.tar.gz opensim-SC-ac02cadbdb817f0a8ab913bfd67f2f8919cdd69f.tar.bz2 opensim-SC-ac02cadbdb817f0a8ab913bfd67f2f8919cdd69f.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs')
| -rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs index d6ad07e..c74584c 100644 --- a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs | |||
| @@ -859,6 +859,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments | |||
| 859 | 859 | ||
| 860 | InventoryItemBase item = new InventoryItemBase(itemID, sp.UUID); | 860 | InventoryItemBase item = new InventoryItemBase(itemID, sp.UUID); |
| 861 | item = m_scene.InventoryService.GetItem(item); | 861 | item = m_scene.InventoryService.GetItem(item); |
| 862 | if (item == null) | ||
| 863 | return; | ||
| 864 | |||
| 862 | bool changed = sp.Appearance.SetAttachment((int)AttachmentPt, itemID, item.AssetID); | 865 | bool changed = sp.Appearance.SetAttachment((int)AttachmentPt, itemID, item.AssetID); |
| 863 | if (changed && m_scene.AvatarFactory != null) | 866 | if (changed && m_scene.AvatarFactory != null) |
| 864 | { | 867 | { |