aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/Linden
diff options
context:
space:
mode:
authorMelanie2012-09-12 21:24:09 +0200
committerMelanie2012-09-12 21:24:09 +0200
commite7932682a2405dab69cb6b4447dde952c2a5c080 (patch)
treeb53c3b45dae1d78aa939806034a9ac1d7fb6d167 /OpenSim/Region/ClientStack/Linden
parentStop expiry timer when upload is complete. Log if timeout is reached. (diff)
downloadopensim-SC_OLD-e7932682a2405dab69cb6b4447dde952c2a5c080.zip
opensim-SC_OLD-e7932682a2405dab69cb6b4447dde952c2a5c080.tar.gz
opensim-SC_OLD-e7932682a2405dab69cb6b4447dde952c2a5c080.tar.bz2
opensim-SC_OLD-e7932682a2405dab69cb6b4447dde952c2a5c080.tar.xz
Add a logger so the prior commit will work
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden')
-rw-r--r--OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs3
1 files changed, 3 insertions, 0 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
index 116055a..88957ff 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
@@ -1093,6 +1093,9 @@ namespace OpenSim.Region.ClientStack.Linden
1093 1093
1094 public class AssetUploader 1094 public class AssetUploader
1095 { 1095 {
1096 private static readonly ILog m_log =
1097 LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
1098
1096 public event UpLoadedAsset OnUpLoad; 1099 public event UpLoadedAsset OnUpLoad;
1097 private UpLoadedAsset handlerUpLoad = null; 1100 private UpLoadedAsset handlerUpLoad = null;
1098 1101