diff options
| author | Melanie | 2012-10-18 20:56:34 +0100 |
|---|---|---|
| committer | Melanie | 2012-10-18 20:56:34 +0100 |
| commit | 72c925a6c9eb4dea6f9134db10c3af28ea83df48 (patch) | |
| tree | 9f991ade4e71f91fc612759b4e783c9f01a740f3 /OpenSim/Region/ClientStack/Linden/Caps/RegionConsoleModule.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Remove redundant and annoyingly modal message box in upload processing. (diff) | |
| download | opensim-SC-72c925a6c9eb4dea6f9134db10c3af28ea83df48.zip opensim-SC-72c925a6c9eb4dea6f9134db10c3af28ea83df48.tar.gz opensim-SC-72c925a6c9eb4dea6f9134db10c3af28ea83df48.tar.bz2 opensim-SC-72c925a6c9eb4dea6f9134db10c3af28ea83df48.tar.xz | |
Merge branch 'avination' into careminster
Conflicts:
OpenSim/Framework/WebUtil.cs
OpenSim/Region/Physics/OdePlugin/OdeScene.cs
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 bac71b0..fcac182 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(); |