diff options
| author | Melanie | 2012-10-17 00:13:49 +0100 |
|---|---|---|
| committer | Melanie | 2012-10-17 00:13:49 +0100 |
| commit | 416bc19da7c9cd9b20931376bf1408820063816a (patch) | |
| tree | d1de81a29fbabe2870552473771b0b527194bef6 /OpenSim/Region/ClientStack/Linden | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Fix perms when linking an object. Set root part perms to the perms (diff) | |
| download | opensim-SC-416bc19da7c9cd9b20931376bf1408820063816a.zip opensim-SC-416bc19da7c9cd9b20931376bf1408820063816a.tar.gz opensim-SC-416bc19da7c9cd9b20931376bf1408820063816a.tar.bz2 opensim-SC-416bc19da7c9cd9b20931376bf1408820063816a.tar.xz | |
Merge branch 'avination' into careminster
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden')
| -rw-r--r-- | OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs index cc65981..d1a1583 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs | |||
| @@ -104,9 +104,9 @@ namespace OpenSim.Region.ClientStack.Linden | |||
| 104 | 104 | ||
| 105 | if (m_workerThreads == null) | 105 | if (m_workerThreads == null) |
| 106 | { | 106 | { |
| 107 | m_workerThreads = new Thread[4]; | 107 | m_workerThreads = new Thread[2]; |
| 108 | 108 | ||
| 109 | for (uint i = 0; i < 4; i++) | 109 | for (uint i = 0; i < 2; i++) |
| 110 | { | 110 | { |
| 111 | m_workerThreads[i] = Watchdog.StartThread(DoTextureRequests, | 111 | m_workerThreads[i] = Watchdog.StartThread(DoTextureRequests, |
| 112 | String.Format("TextureWorkerThread{0}", i), | 112 | String.Format("TextureWorkerThread{0}", i), |