aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-02-22 21:13:23 +0000
committerJustin Clarke Casey2008-02-22 21:13:23 +0000
commitb483faddf2cb3ebfeea44d844ea667ecbdf706f5 (patch)
tree9df7d3bb3d0fd437c98ef37aec363f8d2a8bf104 /OpenSim/Region
parentBugfixes - Scripting works again (diff)
downloadopensim-SC_OLD-b483faddf2cb3ebfeea44d844ea667ecbdf706f5.zip
opensim-SC_OLD-b483faddf2cb3ebfeea44d844ea667ecbdf706f5.tar.gz
opensim-SC_OLD-b483faddf2cb3ebfeea44d844ea667ecbdf706f5.tar.bz2
opensim-SC_OLD-b483faddf2cb3ebfeea44d844ea667ecbdf706f5.tar.xz
* Downgrade texture exception to a warning.
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/Environment/Modules/UserTextureDownloadService.cs9
1 files changed, 5 insertions, 4 deletions
diff --git a/OpenSim/Region/Environment/Modules/UserTextureDownloadService.cs b/OpenSim/Region/Environment/Modules/UserTextureDownloadService.cs
index bec5d2f..1ac6ad2 100644
--- a/OpenSim/Region/Environment/Modules/UserTextureDownloadService.cs
+++ b/OpenSim/Region/Environment/Modules/UserTextureDownloadService.cs
@@ -42,8 +42,8 @@ namespace OpenSim.Region.Environment.Modules
42 /// </summary> 42 /// </summary>
43 public class UserTextureDownloadService 43 public class UserTextureDownloadService
44 { 44 {
45 //private static readonly log4net.ILog m_log 45 private static readonly log4net.ILog m_log
46 // = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 46 = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
47 47
48 /// <summary> 48 /// <summary>
49 /// Holds texture senders before they have received the appropriate texture from the asset cache. 49 /// Holds texture senders before they have received the appropriate texture from the asset cache.
@@ -138,7 +138,6 @@ namespace OpenSim.Region.Environment.Modules
138 // this texture could not be found 138 // this texture could not be found
139 139
140 // TODO Send packet back to the client telling it not to expect the texture 140 // TODO Send packet back to the client telling it not to expect the texture
141 // The absence of this packet doesn't appear to be causing it a problem right now
142 141
143 //m_log.DebugFormat("[USER TEXTURE DOWNLOAD]: Removing download stat for {0}", textureID); 142 //m_log.DebugFormat("[USER TEXTURE DOWNLOAD]: Removing download stat for {0}", textureID);
144 m_scene.AddPendingDownloads(-1); 143 m_scene.AddPendingDownloads(-1);
@@ -150,7 +149,9 @@ namespace OpenSim.Region.Environment.Modules
150 } 149 }
151 else 150 else
152 { 151 {
153 throw new Exception("Got a texture with no sender object to handle it, this shouldn't happen"); 152 m_log.WarnFormat(
153 "Got a texture uuid {0} with no sender object to handle it, this shouldn't happen",
154 textureID);
154 } 155 }
155 } 156 }
156 } 157 }