diff options
| author | UbitUmarov | 2017-08-16 05:05:57 +0100 |
|---|---|---|
| committer | UbitUmarov | 2017-08-16 05:05:57 +0100 |
| commit | 6d4b0a8ce3713eb45170f50b71d295ebaef0e51d (patch) | |
| tree | ba57d22e92ae6cadef8af599a2aa4f2a78057fce /OpenSim/Region/ClientStack/Linden/Caps | |
| parent | fix merge issues (diff) | |
| parent | Merge branch 'master' into BulletSim2017 (diff) | |
| download | opensim-SC-6d4b0a8ce3713eb45170f50b71d295ebaef0e51d.zip opensim-SC-6d4b0a8ce3713eb45170f50b71d295ebaef0e51d.tar.gz opensim-SC-6d4b0a8ce3713eb45170f50b71d295ebaef0e51d.tar.bz2 opensim-SC-6d4b0a8ce3713eb45170f50b71d295ebaef0e51d.tar.xz | |
Merge branch 'master' into httptests
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden/Caps')
| -rw-r--r-- | OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs index 5011c44..9cfa488 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs | |||
| @@ -491,7 +491,7 @@ namespace OpenSim.Region.ClientStack.Linden | |||
| 491 | catch (Exception e) | 491 | catch (Exception e) |
| 492 | { | 492 | { |
| 493 | m_log.ErrorFormat( | 493 | m_log.ErrorFormat( |
| 494 | "[INVENTORY]: Failed to process queued inventory request {0} for {1}. Exception {3}", | 494 | "[INVENTORY]: Failed to process queued inventory request {0} for {1}. Exception {2}", |
| 495 | poolreq.reqID, poolreq.presence != null ? poolreq.presence.Name : "unknown", e); | 495 | poolreq.reqID, poolreq.presence != null ? poolreq.presence.Name : "unknown", e); |
| 496 | } | 496 | } |
| 497 | } | 497 | } |