aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/ClientStack/Linden/Caps/GetAssetsModule.cs10
1 files changed, 8 insertions, 2 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/GetAssetsModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/GetAssetsModule.cs
index dfb16fa..1208bdf 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/GetAssetsModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/GetAssetsModule.cs
@@ -72,6 +72,7 @@ namespace OpenSim.Region.ClientStack.Linden
72 { 72 {
73 public Hashtable response; 73 public Hashtable response;
74 public int bytes; 74 public int bytes;
75 public bool throttle;
75 } 76 }
76 77
77 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 78 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
@@ -244,7 +245,9 @@ namespace OpenSim.Region.ClientStack.Linden
244 245
245 if (m_presence == null || m_presence.IsDeleted) 246 if (m_presence == null || m_presence.IsDeleted)
246 return true; 247 return true;
247 return m_presence.CapCanSendAsset(1, response.bytes); 248 if(response.throttle)
249 return m_presence.CapCanSendAsset(1, response.bytes);
250 return m_presence.CapCanSendAsset(2, response.bytes);
248 } 251 }
249 return false; 252 return false;
250 } 253 }
@@ -352,11 +355,14 @@ namespace OpenSim.Region.ClientStack.Linden
352 } 355 }
353 } 356 }
354 357
355 responses[requestID] = new APollResponse() 358 APollResponse preq= new APollResponse()
356 { 359 {
357 bytes = (int)curresponse["int_bytes"], 360 bytes = (int)curresponse["int_bytes"],
358 response = curresponse 361 response = curresponse
359 }; 362 };
363 if(curresponse.Contains("throttle"))
364 preq.throttle = true;
365 responses[requestID] = preq;
360 } 366 }
361 } 367 }
362 } 368 }