diff options
| author | Justin Clark-Casey (justincc) | 2010-09-13 20:58:50 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2010-09-13 20:58:50 +0100 |
| commit | 366de0a7b57919625429db571f4ed4a231f043da (patch) | |
| tree | 6cf504aef55ce9a651e291daaa320bef1e93ad28 /OpenSim/Region | |
| parent | minor: Clean up log messages generated when an item is attached (diff) | |
| download | opensim-SC_OLD-366de0a7b57919625429db571f4ed4a231f043da.zip opensim-SC_OLD-366de0a7b57919625429db571f4ed4a231f043da.tar.gz opensim-SC_OLD-366de0a7b57919625429db571f4ed4a231f043da.tar.bz2 opensim-SC_OLD-366de0a7b57919625429db571f4ed4a231f043da.tar.xz | |
If attachment fails (e.g. because asset wasn't found) then don't try to set attachment as shown in inventory
Doing this results in a null reference exception
Diffstat (limited to 'OpenSim/Region')
| -rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs index a3712d1..b7ecb55 100644 --- a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs | |||
| @@ -233,11 +233,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments | |||
| 233 | if (updateInventoryStatus) | 233 | if (updateInventoryStatus) |
| 234 | { | 234 | { |
| 235 | if (att == null) | 235 | if (att == null) |
| 236 | { | ||
| 237 | ShowDetachInUserInventory(itemID, remoteClient); | 236 | ShowDetachInUserInventory(itemID, remoteClient); |
| 238 | } | 237 | else |
| 239 | 238 | SetAttachmentInventoryStatus(att, remoteClient, itemID, AttachmentPt); | |
| 240 | SetAttachmentInventoryStatus(att, remoteClient, itemID, AttachmentPt); | ||
| 241 | } | 239 | } |
| 242 | 240 | ||
| 243 | if (null == att) | 241 | if (null == att) |