diff options
author | Melanie | 2009-10-08 08:07:38 +0100 |
---|---|---|
committer | Melanie | 2009-10-08 08:07:38 +0100 |
commit | fe679be9e76190ac0dc8892469787e63a7a48b5c (patch) | |
tree | 220ef33da75f09b3e7ef3684c5ed7367e175691e /OpenSim/Region/CoreModules/Scripting | |
parent | store owner_uuid in the region table (diff) | |
parent | One last attempt at tunning the locking/no locking behaviour. The previous on... (diff) | |
download | opensim-SC_OLD-fe679be9e76190ac0dc8892469787e63a7a48b5c.zip opensim-SC_OLD-fe679be9e76190ac0dc8892469787e63a7a48b5c.tar.gz opensim-SC_OLD-fe679be9e76190ac0dc8892469787e63a7a48b5c.tar.bz2 opensim-SC_OLD-fe679be9e76190ac0dc8892469787e63a7a48b5c.tar.xz |
Merge branch 'htb-throttle'
Diffstat (limited to 'OpenSim/Region/CoreModules/Scripting')
-rw-r--r-- | OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs | 1 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/Scripting/XMLRPC/XMLRPCModule.cs | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs b/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs index 45e724d..d78931a 100644 --- a/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs +++ b/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs | |||
@@ -323,7 +323,6 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest | |||
323 | httpThread.IsBackground = true; | 323 | httpThread.IsBackground = true; |
324 | _finished = false; | 324 | _finished = false; |
325 | httpThread.Start(); | 325 | httpThread.Start(); |
326 | ThreadTracker.Add(httpThread); | ||
327 | } | 326 | } |
328 | 327 | ||
329 | /* | 328 | /* |
diff --git a/OpenSim/Region/CoreModules/Scripting/XMLRPC/XMLRPCModule.cs b/OpenSim/Region/CoreModules/Scripting/XMLRPC/XMLRPCModule.cs index 8a169f8..97899a7 100644 --- a/OpenSim/Region/CoreModules/Scripting/XMLRPC/XMLRPCModule.cs +++ b/OpenSim/Region/CoreModules/Scripting/XMLRPC/XMLRPCModule.cs | |||
@@ -639,7 +639,6 @@ namespace OpenSim.Region.CoreModules.Scripting.XMLRPC | |||
639 | httpThread.IsBackground = true; | 639 | httpThread.IsBackground = true; |
640 | _finished = false; | 640 | _finished = false; |
641 | httpThread.Start(); | 641 | httpThread.Start(); |
642 | ThreadTracker.Add(httpThread); | ||
643 | } | 642 | } |
644 | 643 | ||
645 | /* | 644 | /* |