diff options
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs | 4 | ||||
| -rw-r--r-- | OpenSim/Region/ClientStack/Linden/Caps/RegionConsoleModule.cs | 2 |
2 files changed, 3 insertions, 3 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), |
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/RegionConsoleModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/RegionConsoleModule.cs index 413536d..0a5ad0f 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/RegionConsoleModule.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/RegionConsoleModule.cs | |||
| @@ -104,7 +104,7 @@ namespace OpenSim.Region.ClientStack.Linden | |||
| 104 | 104 | ||
| 105 | public void RegisterCaps(UUID agentID, Caps caps) | 105 | public void RegisterCaps(UUID agentID, Caps caps) |
| 106 | { | 106 | { |
| 107 | if (!m_scene.RegionInfo.EstateSettings.IsEstateManagerOrOwner(agentID)) | 107 | if (!m_scene.RegionInfo.EstateSettings.IsEstateManagerOrOwner(agentID) && !m_scene.Permissions.IsGod(agentID)) |
| 108 | return; | 108 | return; |
| 109 | 109 | ||
| 110 | UUID capID = UUID.Random(); | 110 | UUID capID = UUID.Random(); |