diff options
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/Framework/Servers/HttpServer/PollServiceWorkerThread.cs | 4 | ||||
-rw-r--r-- | OpenSim/Services/Connectors/Inventory/InventoryServiceConnector.cs | 5 |
2 files changed, 2 insertions, 7 deletions
diff --git a/OpenSim/Framework/Servers/HttpServer/PollServiceWorkerThread.cs b/OpenSim/Framework/Servers/HttpServer/PollServiceWorkerThread.cs index 033450a..cc8bdb6 100644 --- a/OpenSim/Framework/Servers/HttpServer/PollServiceWorkerThread.cs +++ b/OpenSim/Framework/Servers/HttpServer/PollServiceWorkerThread.cs | |||
@@ -50,9 +50,7 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
50 | private readonly BaseHttpServer m_server; | 50 | private readonly BaseHttpServer m_server; |
51 | private BlockingQueue<PollServiceHttpRequest> m_request; | 51 | private BlockingQueue<PollServiceHttpRequest> m_request; |
52 | private bool m_running = true; | 52 | private bool m_running = true; |
53 | private int m_timeout = 250; | 53 | private int m_timeout = 250; |
54 | |||
55 | |||
56 | 54 | ||
57 | public PollServiceWorkerThread(BaseHttpServer pSrv, int pTimeout) | 55 | public PollServiceWorkerThread(BaseHttpServer pSrv, int pTimeout) |
58 | { | 56 | { |
diff --git a/OpenSim/Services/Connectors/Inventory/InventoryServiceConnector.cs b/OpenSim/Services/Connectors/Inventory/InventoryServiceConnector.cs index e047f71..d1d0645 100644 --- a/OpenSim/Services/Connectors/Inventory/InventoryServiceConnector.cs +++ b/OpenSim/Services/Connectors/Inventory/InventoryServiceConnector.cs | |||
@@ -475,7 +475,7 @@ namespace OpenSim.Services.Connectors | |||
475 | } | 475 | } |
476 | catch (Exception e) | 476 | catch (Exception e) |
477 | { | 477 | { |
478 | m_log.ErrorFormat("[INVENTORY CONNECTOR]: Query inventory item operation failed, {0} {1}", | 478 | m_log.ErrorFormat("[INVENTORY CONNECTOR]: Query inventory folder operation failed, {0} {1}", |
479 | e.Source, e.Message); | 479 | e.Source, e.Message); |
480 | } | 480 | } |
481 | 481 | ||
@@ -576,9 +576,6 @@ namespace OpenSim.Services.Connectors | |||
576 | } | 576 | } |
577 | 577 | ||
578 | callback(folders, items); | 578 | callback(folders, items); |
579 | |||
580 | } | 579 | } |
581 | |||
582 | |||
583 | } | 580 | } |
584 | } | 581 | } |