aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs14
1 files changed, 7 insertions, 7 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs
index 06ecf97..cecef0d 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs
@@ -55,7 +55,7 @@ namespace OpenSim.Region.ClientStack.Linden
55 { 55 {
56// private static readonly ILog m_log = 56// private static readonly ILog m_log =
57// LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 57// LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
58 58
59 private Scene m_scene; 59 private Scene m_scene;
60 private IAssetService m_AssetService; 60 private IAssetService m_AssetService;
61 private bool m_Enabled = true; 61 private bool m_Enabled = true;
@@ -64,7 +64,7 @@ namespace OpenSim.Region.ClientStack.Linden
64 private string m_URL2; 64 private string m_URL2;
65 private string m_RedirectURL = null; 65 private string m_RedirectURL = null;
66 private string m_RedirectURL2 = null; 66 private string m_RedirectURL2 = null;
67 67
68 struct aPollRequest 68 struct aPollRequest
69 { 69 {
70 public PollServiceMeshEventArgs thepoll; 70 public PollServiceMeshEventArgs thepoll;
@@ -131,7 +131,7 @@ namespace OpenSim.Region.ClientStack.Linden
131 return; 131 return;
132 132
133 m_scene = pScene; 133 m_scene = pScene;
134 134
135 m_assetService = pScene.AssetService; 135 m_assetService = pScene.AssetService;
136 } 136 }
137 137
@@ -371,7 +371,7 @@ namespace OpenSim.Region.ClientStack.Linden
371 { 371 {
372 string capUrl = "/CAPS/" + UUID.Random() + "/"; 372 string capUrl = "/CAPS/" + UUID.Random() + "/";
373 373
374 // Register this as a poll service 374 // Register this as a poll service
375 PollServiceMeshEventArgs args = new PollServiceMeshEventArgs(capUrl, agentID, m_scene); 375 PollServiceMeshEventArgs args = new PollServiceMeshEventArgs(capUrl, agentID, m_scene);
376 376
377 args.Type = PollServiceEventArgs.EventType.Mesh; 377 args.Type = PollServiceEventArgs.EventType.Mesh;
@@ -422,7 +422,7 @@ namespace OpenSim.Region.ClientStack.Linden
422 private readonly Scene m_scene; 422 private readonly Scene m_scene;
423 private ThrottleOutPacketType Throttle; 423 private ThrottleOutPacketType Throttle;
424 private readonly UUID User; 424 private readonly UUID User;
425 425
426 public MeshCapsDataThrottler(int pBytes, int max, int min, Scene pScene, UUID puser) 426 public MeshCapsDataThrottler(int pBytes, int max, int min, Scene pScene, UUID puser)
427 { 427 {
428 ThrottleBytes = pBytes; 428 ThrottleBytes = pBytes;
@@ -450,7 +450,7 @@ namespace OpenSim.Region.ClientStack.Linden
450 // Normal 450 // Normal
451 if (BytesSent <= ThrottleBytes) 451 if (BytesSent <= ThrottleBytes)
452 { 452 {
453 BytesSent += response.bytes; 453 BytesSent += response.bytes;
454 return true; 454 return true;
455 } 455 }
456 else 456 else
@@ -460,7 +460,7 @@ namespace OpenSim.Region.ClientStack.Linden
460 } 460 }
461 return haskey; 461 return haskey;
462 } 462 }
463 463
464 public void ProcessTime() 464 public void ProcessTime()
465 { 465 {
466 PassTime(); 466 PassTime();