aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/ClientStack')
-rw-r--r--OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs22
-rw-r--r--OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs4
-rw-r--r--OpenSim/Region/ClientStack/Linden/Caps/RegionConsoleModule.cs2
3 files changed, 14 insertions, 14 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
index c705f10..650cd50 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
@@ -1116,17 +1116,17 @@ namespace OpenSim.Region.ClientStack.Linden
1116 else 1116 else
1117 { 1117 {
1118 AddNewInventoryItem(m_HostCapsObj.AgentID, item, (uint)cost); 1118 AddNewInventoryItem(m_HostCapsObj.AgentID, item, (uint)cost);
1119 if (client != null) 1119// if (client != null)
1120 { 1120// {
1121 // let users see anything.. i don't so far 1121// // let users see anything.. i don't so far
1122 string str; 1122// string str;
1123 if (cost > 0) 1123// if (cost > 0)
1124 // dont remember where is money unit name to put here 1124// // dont remember where is money unit name to put here
1125 str = "Upload complete. charged " + cost.ToString() + "$"; 1125// str = "Upload complete. charged " + cost.ToString() + "$";
1126 else 1126// else
1127 str = "Upload complete"; 1127// str = "Upload complete";
1128 client.SendAgentAlertMessage(str, true); 1128// client.SendAgentAlertMessage(str, true);
1129 } 1129// }
1130 } 1130 }
1131 } 1131 }
1132 1132
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();