diff options
author | Melanie Thielker | 2017-01-05 19:07:37 +0000 |
---|---|---|
committer | Melanie Thielker | 2017-01-05 19:07:37 +0000 |
commit | b16abc8166c29585cb76cc55c3bdd76e5833cb4f (patch) | |
tree | 6a34f465a74b7a3a6dc00a3d7aa8dcc25ac3e3a5 /OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs | |
parent | Make it possible to disable the bakes module in the way it is described in co... (diff) | |
download | opensim-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/GetTextureModule.cs')
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs index 14a59fe..0c20e04 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs | |||
@@ -81,7 +81,7 @@ namespace OpenSim.Region.ClientStack.Linden | |||
81 | new OpenMetaverse.BlockingQueue<aPollRequest>(); | 81 | new OpenMetaverse.BlockingQueue<aPollRequest>(); |
82 | 82 | ||
83 | private Dictionary<UUID,PollServiceTextureEventArgs> m_pollservices = new Dictionary<UUID,PollServiceTextureEventArgs>(); | 83 | private Dictionary<UUID,PollServiceTextureEventArgs> m_pollservices = new Dictionary<UUID,PollServiceTextureEventArgs>(); |
84 | 84 | ||
85 | private string m_Url = "localhost"; | 85 | private string m_Url = "localhost"; |
86 | 86 | ||
87 | #region ISharedRegionModule Members | 87 | #region ISharedRegionModule Members |
@@ -148,7 +148,7 @@ namespace OpenSim.Region.ClientStack.Linden | |||
148 | } | 148 | } |
149 | private int ExtractImageThrottle(byte[] pthrottles) | 149 | private int ExtractImageThrottle(byte[] pthrottles) |
150 | { | 150 | { |
151 | 151 | ||
152 | byte[] adjData; | 152 | byte[] adjData; |
153 | int pos = 0; | 153 | int pos = 0; |
154 | 154 | ||
@@ -195,10 +195,10 @@ namespace OpenSim.Region.ClientStack.Linden | |||
195 | if(m_NumberScenes <= 0 && m_workerThreads != null) | 195 | if(m_NumberScenes <= 0 && m_workerThreads != null) |
196 | { | 196 | { |
197 | m_log.DebugFormat("[GetTextureModule] Closing"); | 197 | m_log.DebugFormat("[GetTextureModule] Closing"); |
198 | 198 | ||
199 | foreach (Thread t in m_workerThreads) | 199 | foreach (Thread t in m_workerThreads) |
200 | Watchdog.AbortThread(t.ManagedThreadId); | 200 | Watchdog.AbortThread(t.ManagedThreadId); |
201 | 201 | ||
202 | m_queue.Clear(); | 202 | m_queue.Clear(); |
203 | } | 203 | } |
204 | } | 204 | } |
@@ -222,7 +222,7 @@ namespace OpenSim.Region.ClientStack.Linden | |||
222 | private Scene m_scene; | 222 | private Scene m_scene; |
223 | private CapsDataThrottler m_throttler = new CapsDataThrottler(100000, 1400000,10000); | 223 | private CapsDataThrottler m_throttler = new CapsDataThrottler(100000, 1400000,10000); |
224 | public PollServiceTextureEventArgs(UUID pId, Scene scene) : | 224 | public PollServiceTextureEventArgs(UUID pId, Scene scene) : |
225 | base(null, "", null, null, null, pId, int.MaxValue) | 225 | base(null, "", null, null, null, pId, int.MaxValue) |
226 | { | 226 | { |
227 | m_scene = scene; | 227 | m_scene = scene; |
228 | // x is request id, y is userid | 228 | // x is request id, y is userid |
@@ -258,7 +258,7 @@ namespace OpenSim.Region.ClientStack.Linden | |||
258 | reqinfo.reqID = x; | 258 | reqinfo.reqID = x; |
259 | reqinfo.request = y; | 259 | reqinfo.request = y; |
260 | reqinfo.send503 = false; | 260 | reqinfo.send503 = false; |
261 | 261 | ||
262 | lock (responses) | 262 | lock (responses) |
263 | { | 263 | { |
264 | if (responses.Count > 0) | 264 | if (responses.Count > 0) |
@@ -317,7 +317,7 @@ namespace OpenSim.Region.ClientStack.Linden | |||
317 | Hashtable headers = new Hashtable(); | 317 | Hashtable headers = new Hashtable(); |
318 | headers["Retry-After"] = 30; | 318 | headers["Retry-After"] = 30; |
319 | response["headers"] = headers; | 319 | response["headers"] = headers; |
320 | 320 | ||
321 | lock (responses) | 321 | lock (responses) |
322 | responses[requestID] = new aPollResponse() {bytes = 0, response = response}; | 322 | responses[requestID] = new aPollResponse() {bytes = 0, response = response}; |
323 | 323 | ||
@@ -334,13 +334,13 @@ namespace OpenSim.Region.ClientStack.Linden | |||
334 | response["content_type"] = "text/plain"; | 334 | response["content_type"] = "text/plain"; |
335 | response["keepalive"] = false; | 335 | response["keepalive"] = false; |
336 | response["reusecontext"] = false; | 336 | response["reusecontext"] = false; |
337 | 337 | ||
338 | lock (responses) | 338 | lock (responses) |
339 | responses[requestID] = new aPollResponse() {bytes = 0, response = response}; | 339 | responses[requestID] = new aPollResponse() {bytes = 0, response = response}; |
340 | 340 | ||
341 | return; | 341 | return; |
342 | } | 342 | } |
343 | 343 | ||
344 | response = m_getTextureHandler.Handle(requestinfo.request); | 344 | response = m_getTextureHandler.Handle(requestinfo.request); |
345 | lock (responses) | 345 | lock (responses) |
346 | { | 346 | { |
@@ -349,8 +349,8 @@ namespace OpenSim.Region.ClientStack.Linden | |||
349 | bytes = (int) response["int_bytes"], | 349 | bytes = (int) response["int_bytes"], |
350 | response = response | 350 | response = response |
351 | }; | 351 | }; |
352 | 352 | ||
353 | } | 353 | } |
354 | m_throttler.ProcessTime(); | 354 | m_throttler.ProcessTime(); |
355 | } | 355 | } |
356 | 356 | ||
@@ -368,16 +368,16 @@ namespace OpenSim.Region.ClientStack.Linden | |||
368 | { | 368 | { |
369 | string capUrl = "/CAPS/" + UUID.Random() + "/"; | 369 | string capUrl = "/CAPS/" + UUID.Random() + "/"; |
370 | 370 | ||
371 | // Register this as a poll service | 371 | // Register this as a poll service |
372 | PollServiceTextureEventArgs args = new PollServiceTextureEventArgs(agentID, m_scene); | 372 | PollServiceTextureEventArgs args = new PollServiceTextureEventArgs(agentID, m_scene); |
373 | 373 | ||
374 | args.Type = PollServiceEventArgs.EventType.Texture; | 374 | args.Type = PollServiceEventArgs.EventType.Texture; |
375 | MainServer.Instance.AddPollServiceHTTPHandler(capUrl, args); | 375 | MainServer.Instance.AddPollServiceHTTPHandler(capUrl, args); |
376 | 376 | ||
377 | string hostName = m_scene.RegionInfo.ExternalHostName; | 377 | string hostName = m_scene.RegionInfo.ExternalHostName; |
378 | uint port = (MainServer.Instance == null) ? 0 : MainServer.Instance.Port; | 378 | uint port = (MainServer.Instance == null) ? 0 : MainServer.Instance.Port; |
379 | string protocol = "http"; | 379 | string protocol = "http"; |
380 | 380 | ||
381 | if (MainServer.Instance.UseSSL) | 381 | if (MainServer.Instance.UseSSL) |
382 | { | 382 | { |
383 | hostName = MainServer.Instance.SSLCommonName; | 383 | hostName = MainServer.Instance.SSLCommonName; |
@@ -484,5 +484,5 @@ namespace OpenSim.Region.ClientStack.Linden | |||
484 | } | 484 | } |
485 | public int ThrottleBytes; | 485 | public int ThrottleBytes; |
486 | } | 486 | } |
487 | } | 487 | } |
488 | } | 488 | } |