diff options
| author | Justin Clark-Casey (justincc) | 2013-11-15 23:16:12 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2013-11-15 23:16:12 +0000 |
| commit | ecfb78dd167c9c2c4509ca4bcf74d0c801641f39 (patch) | |
| tree | 1c262b1a2a64fee5698c865febd039533bbe7021 /OpenSim | |
| parent | If HGSuitcaseInventoryService.GetRootFolder() fails to create a suitcase fold... (diff) | |
| download | opensim-SC_OLD-ecfb78dd167c9c2c4509ca4bcf74d0c801641f39.zip opensim-SC_OLD-ecfb78dd167c9c2c4509ca4bcf74d0c801641f39.tar.gz opensim-SC_OLD-ecfb78dd167c9c2c4509ca4bcf74d0c801641f39.tar.bz2 opensim-SC_OLD-ecfb78dd167c9c2c4509ca4bcf74d0c801641f39.tar.xz | |
minor: Use default(UUID) in rez attachment failure error logging rather than (UUID)null
Patch from http://opensimulator.org/mantis/view.php?id=6843
Thanks Kira.
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs index d0e0b35..1ca142e 100644 --- a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs | |||
| @@ -321,7 +321,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments | |||
| 321 | } | 321 | } |
| 322 | catch (Exception e) | 322 | catch (Exception e) |
| 323 | { | 323 | { |
| 324 | UUID agentId = (sp.ControllingClient == null) ? (UUID)null : sp.ControllingClient.AgentId; | 324 | UUID agentId = (sp.ControllingClient == null) ? default(UUID) : sp.ControllingClient.AgentId; |
| 325 | m_log.ErrorFormat("[ATTACHMENTS MODULE]: Unable to rez attachment with itemID {0}, assetID {1}, point {2} for {3}: {4}\n{5}", | 325 | m_log.ErrorFormat("[ATTACHMENTS MODULE]: Unable to rez attachment with itemID {0}, assetID {1}, point {2} for {3}: {4}\n{5}", |
| 326 | attach.ItemID, attach.AssetID, attachmentPt, agentId, e.Message, e.StackTrace); | 326 | attach.ItemID, attach.AssetID, attachmentPt, agentId, e.Message, e.StackTrace); |
| 327 | } | 327 | } |