aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorroot2019-03-11 23:36:52 +0000
committerroot2019-03-11 23:36:52 +0000
commitd8e558a3daf9b55dd4c81f1687b82cdd907f0dc3 (patch)
tree726c3ed2fab10270a1e9c63916d91dde334c7790 /OpenSim
parentRemove some more cut-and-paste typos in 6dof constraint setup in XNA (diff)
downloadopensim-SC-d8e558a3daf9b55dd4c81f1687b82cdd907f0dc3.zip
opensim-SC-d8e558a3daf9b55dd4c81f1687b82cdd907f0dc3.tar.gz
opensim-SC-d8e558a3daf9b55dd4c81f1687b82cdd907f0dc3.tar.bz2
opensim-SC-d8e558a3daf9b55dd4c81f1687b82cdd907f0dc3.tar.xz
Allow anyone to get a CAP to the console - check rights on use
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/ClientStack/Linden/Caps/RegionConsoleModule.cs10
1 files changed, 8 insertions, 2 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/RegionConsoleModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/RegionConsoleModule.cs
index e8387e3..1f229c0 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/RegionConsoleModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/RegionConsoleModule.cs
@@ -104,8 +104,8 @@ 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) && !m_scene.Permissions.IsGod(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();
111 111
@@ -191,6 +191,12 @@ namespace OpenSim.Region.ClientStack.Linden
191 191
192 OSD osd = OSDParser.DeserializeLLSDXml(message); 192 OSD osd = OSDParser.DeserializeLLSDXml(message);
193 193
194 if (!m_scene.RegionInfo.EstateSettings.IsEstateManagerOrOwner(m_agentID) && !m_isGod)
195 {
196 m_consoleModule.SendConsoleOutput(m_agentID, "No access");
197 return new byte[0];
198 }
199
194 string cmd = osd.AsString(); 200 string cmd = osd.AsString();
195 if (cmd == "set console on") 201 if (cmd == "set console on")
196 { 202 {