aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs
diff options
context:
space:
mode:
authorMelanie Thielker2017-01-05 19:07:37 +0000
committerMelanie Thielker2017-01-05 19:07:37 +0000
commitb16abc8166c29585cb76cc55c3bdd76e5833cb4f (patch)
tree6a34f465a74b7a3a6dc00a3d7aa8dcc25ac3e3a5 /OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs
parentMake it possible to disable the bakes module in the way it is described in co... (diff)
downloadopensim-SC_OLD-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.zip
opensim-SC_OLD-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.tar.gz
opensim-SC_OLD-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.tar.bz2
opensim-SC_OLD-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.tar.xz
Massive tab and trailing space cleanup
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs')
-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 f66ef57..ae18bc1 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;
@@ -132,7 +132,7 @@ namespace OpenSim.Region.ClientStack.Linden
132 return; 132 return;
133 133
134 m_scene = pScene; 134 m_scene = pScene;
135 135
136 m_assetService = pScene.AssetService; 136 m_assetService = pScene.AssetService;
137 } 137 }
138 138
@@ -342,7 +342,7 @@ namespace OpenSim.Region.ClientStack.Linden
342 { 342 {
343 string capUrl = "/CAPS/" + UUID.Random() + "/"; 343 string capUrl = "/CAPS/" + UUID.Random() + "/";
344 344
345 // Register this as a poll service 345 // Register this as a poll service
346 PollServiceMeshEventArgs args = new PollServiceMeshEventArgs(capUrl, agentID, m_scene); 346 PollServiceMeshEventArgs args = new PollServiceMeshEventArgs(capUrl, agentID, m_scene);
347 347
348 args.Type = PollServiceEventArgs.EventType.Mesh; 348 args.Type = PollServiceEventArgs.EventType.Mesh;
@@ -394,7 +394,7 @@ namespace OpenSim.Region.ClientStack.Linden
394 private readonly Scene m_scene; 394 private readonly Scene m_scene;
395 private ThrottleOutPacketType Throttle; 395 private ThrottleOutPacketType Throttle;
396 private readonly UUID User; 396 private readonly UUID User;
397 397
398 public MeshCapsDataThrottler(int pBytes, int max, int min, Scene pScene, UUID puser) 398 public MeshCapsDataThrottler(int pBytes, int max, int min, Scene pScene, UUID puser)
399 { 399 {
400 ThrottleBytes = pBytes; 400 ThrottleBytes = pBytes;
@@ -422,7 +422,7 @@ namespace OpenSim.Region.ClientStack.Linden
422 // Normal 422 // Normal
423 if (BytesSent <= ThrottleBytes) 423 if (BytesSent <= ThrottleBytes)
424 { 424 {
425 BytesSent += response.bytes; 425 BytesSent += response.bytes;
426 return true; 426 return true;
427 } 427 }
428 else 428 else
@@ -432,7 +432,7 @@ namespace OpenSim.Region.ClientStack.Linden
432 } 432 }
433 return haskey; 433 return haskey;
434 } 434 }
435 435
436 public void ProcessTime() 436 public void ProcessTime()
437 { 437 {
438 PassTime(); 438 PassTime();