aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/Linden/Caps
diff options
context:
space:
mode:
authorMelanie2012-10-17 01:31:05 +0200
committerMelanie2012-10-17 01:31:05 +0200
commit322eefbb6f6c3cc418a327a3b51357a12ee5036f (patch)
treeb876d1d87d33ab8efdfdd055d650113524c93033 /OpenSim/Region/ClientStack/Linden/Caps
parentFix perms when linking an object. Set root part perms to the perms (diff)
downloadopensim-SC_OLD-322eefbb6f6c3cc418a327a3b51357a12ee5036f.zip
opensim-SC_OLD-322eefbb6f6c3cc418a327a3b51357a12ee5036f.tar.gz
opensim-SC_OLD-322eefbb6f6c3cc418a327a3b51357a12ee5036f.tar.bz2
opensim-SC_OLD-322eefbb6f6c3cc418a327a3b51357a12ee5036f.tar.xz
Allow the console to be used by gods as well as region owners.
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden/Caps')
-rw-r--r--OpenSim/Region/ClientStack/Linden/Caps/RegionConsoleModule.cs2
1 files changed, 1 insertions, 1 deletions
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();