diff options
| author | root | 2010-09-16 21:07:09 +0200 |
|---|---|---|
| committer | root | 2010-09-16 21:07:09 +0200 |
| commit | 512ded6eb57019aed8aaa73d64b62d29450023cf (patch) | |
| tree | a5af484a00f6b57ebf9d4c4aa6f5804362703917 /OpenSim/Region/CoreModules | |
| parent | Suppress the strange "Result not Dictionary" messages that happen when (diff) | |
| download | opensim-SC_OLD-512ded6eb57019aed8aaa73d64b62d29450023cf.zip opensim-SC_OLD-512ded6eb57019aed8aaa73d64b62d29450023cf.tar.gz opensim-SC_OLD-512ded6eb57019aed8aaa73d64b62d29450023cf.tar.bz2 opensim-SC_OLD-512ded6eb57019aed8aaa73d64b62d29450023cf.tar.xz | |
Catch a nullref
Diffstat (limited to 'OpenSim/Region/CoreModules')
| -rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs index 5378930..7c95658 100644 --- a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs | |||
| @@ -334,7 +334,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments | |||
| 334 | if (m_scene.InventoryService != null) | 334 | if (m_scene.InventoryService != null) |
| 335 | item = m_scene.InventoryService.GetItem(item); | 335 | item = m_scene.InventoryService.GetItem(item); |
| 336 | 336 | ||
| 337 | presence.Appearance.SetAttachment((int)AttachmentPt, itemID, item.AssetID /*att.UUID*/); | 337 | if (presence.Appearance != null) |
| 338 | presence.Appearance.SetAttachment((int)AttachmentPt, itemID, item.AssetID /*att.UUID*/); | ||
| 338 | } | 339 | } |
| 339 | 340 | ||
| 340 | return att.UUID; | 341 | return att.UUID; |