diff options
| author | UbitUmarov | 2012-10-30 19:42:32 +0000 |
|---|---|---|
| committer | UbitUmarov | 2012-10-30 19:42:32 +0000 |
| commit | e6c8eca504a4cc0daace04ad51c2cb65b3904591 (patch) | |
| tree | 7966cbf850ac084e3c1d1ab7b3e788a75844bbe7 /OpenSim/Region/ClientStack/Linden/Caps/RegionConsoleModule.cs | |
| parent | revert last change (diff) | |
| parent | Set the script state to new rez when a scriptis saved, rather than region start. (diff) | |
| download | opensim-SC-e6c8eca504a4cc0daace04ad51c2cb65b3904591.zip opensim-SC-e6c8eca504a4cc0daace04ad51c2cb65b3904591.tar.gz opensim-SC-e6c8eca504a4cc0daace04ad51c2cb65b3904591.tar.bz2 opensim-SC-e6c8eca504a4cc0daace04ad51c2cb65b3904591.tar.xz | |
Merge branch 'avination' into ubitwork
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden/Caps/RegionConsoleModule.cs')
| -rw-r--r-- | OpenSim/Region/ClientStack/Linden/Caps/RegionConsoleModule.cs | 2 |
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(); |