diff options
| author | Melanie Thielker | 2010-04-23 14:41:20 +0200 |
|---|---|---|
| committer | Melanie Thielker | 2010-04-23 14:41:20 +0200 |
| commit | 780630d7c05f7306ffceb52db0eda1401112f426 (patch) | |
| tree | ec66c7e8e1bd3b94e543d87e389d23753bda2dd8 /OpenSim/Region/CoreModules | |
| parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
| download | opensim-SC-780630d7c05f7306ffceb52db0eda1401112f426.zip opensim-SC-780630d7c05f7306ffceb52db0eda1401112f426.tar.gz opensim-SC-780630d7c05f7306ffceb52db0eda1401112f426.tar.bz2 opensim-SC-780630d7c05f7306ffceb52db0eda1401112f426.tar.xz | |
Fix a nullref in attachment handling. Add some debug to find the attachment
state issue
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 354994b..a667b80 100644 --- a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs | |||
| @@ -271,7 +271,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments | |||
| 271 | if (m_scene.TryGetScenePresence(remoteClient.AgentId, out presence)) | 271 | if (m_scene.TryGetScenePresence(remoteClient.AgentId, out presence)) |
| 272 | { | 272 | { |
| 273 | InventoryItemBase item = new InventoryItemBase(itemID, remoteClient.AgentId); | 273 | InventoryItemBase item = new InventoryItemBase(itemID, remoteClient.AgentId); |
| 274 | item = m_scene.InventoryService.GetItem(item); | 274 | if (m_scene.InventoryService != null) |
| 275 | item = m_scene.InventoryService.GetItem(item); | ||
| 275 | 276 | ||
| 276 | presence.Appearance.SetAttachment((int)AttachmentPt, itemID, item.AssetID /*att.UUID*/); | 277 | presence.Appearance.SetAttachment((int)AttachmentPt, itemID, item.AssetID /*att.UUID*/); |
| 277 | } | 278 | } |