diff options
author | Oren Hurvitz | 2014-03-26 21:31:16 +0200 |
---|---|---|
committer | Oren Hurvitz | 2014-03-26 20:34:55 +0100 |
commit | 7a47c15edbbebd93fc3355dfed68c2d5f635c897 (patch) | |
tree | 451e9121a86b6bcf9cf02855049f442d7bd5a866 /OpenSim/Addons/Groups/Hypergrid | |
parent | Revert "Use log-rolling on the log files (once per day)" (diff) | |
download | opensim-SC_OLD-7a47c15edbbebd93fc3355dfed68c2d5f635c897.zip opensim-SC_OLD-7a47c15edbbebd93fc3355dfed68c2d5f635c897.tar.gz opensim-SC_OLD-7a47c15edbbebd93fc3355dfed68c2d5f635c897.tar.bz2 opensim-SC_OLD-7a47c15edbbebd93fc3355dfed68c2d5f635c897.tar.xz |
- Increased the threadpool timeout to 10 minutes
- Changed a few places that launch long-lasting threads to skip the timeout altogether
Diffstat (limited to 'OpenSim/Addons/Groups/Hypergrid')
-rw-r--r-- | OpenSim/Addons/Groups/Hypergrid/GroupsServiceHGConnectorModule.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Addons/Groups/Hypergrid/GroupsServiceHGConnectorModule.cs b/OpenSim/Addons/Groups/Hypergrid/GroupsServiceHGConnectorModule.cs index 7d48516..a750d8d 100644 --- a/OpenSim/Addons/Groups/Hypergrid/GroupsServiceHGConnectorModule.cs +++ b/OpenSim/Addons/Groups/Hypergrid/GroupsServiceHGConnectorModule.cs | |||
@@ -1,4 +1,4 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (c) Contributors, http://opensimulator.org/ | 2 | * Copyright (c) Contributors, http://opensimulator.org/ |
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | 3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. |
4 | * | 4 | * |
@@ -560,7 +560,7 @@ namespace OpenSim.Groups | |||
560 | 560 | ||
561 | // so we have the list of urls to send the notice to | 561 | // so we have the list of urls to send the notice to |
562 | // this may take a long time... | 562 | // this may take a long time... |
563 | Util.FireAndForget(delegate | 563 | Util.RunThreadNoTimeout(delegate |
564 | { | 564 | { |
565 | foreach (string u in urls) | 565 | foreach (string u in urls) |
566 | { | 566 | { |
@@ -571,7 +571,7 @@ namespace OpenSim.Groups | |||
571 | hasAttachment, attType, attName, attItemID, AgentUUIForOutside(attOwnerID)); | 571 | hasAttachment, attType, attName, attItemID, AgentUUIForOutside(attOwnerID)); |
572 | } | 572 | } |
573 | } | 573 | } |
574 | }); | 574 | }, "AddGroupNotice", null); |
575 | 575 | ||
576 | return true; | 576 | return true; |
577 | } | 577 | } |