diff options
| author | UbitUmarov | 2017-01-08 02:00:24 +0000 |
|---|---|---|
| committer | UbitUmarov | 2017-01-08 02:00:24 +0000 |
| commit | 45695ef2e335639bb88e184291f05551bc3c146c (patch) | |
| tree | 93d24a1e43a7665b94844a302726860b064833b9 /OpenSim/Region/Framework/Scenes | |
| parent | Merge branch 'master' into httptests (diff) | |
| parent | add the new GOD ossl option to osslEnable.ini (diff) | |
| download | opensim-SC-45695ef2e335639bb88e184291f05551bc3c146c.zip opensim-SC-45695ef2e335639bb88e184291f05551bc3c146c.tar.gz opensim-SC-45695ef2e335639bb88e184291f05551bc3c146c.tar.bz2 opensim-SC-45695ef2e335639bb88e184291f05551bc3c146c.tar.xz | |
Merge branch 'master' into httptests
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index bd0786b..9545c13 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
| @@ -6120,7 +6120,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 6120 | string reason; | 6120 | string reason; |
| 6121 | 6121 | ||
| 6122 | // dont mess with gods | 6122 | // dont mess with gods |
| 6123 | if(IsViewerUIGod || m_scene.Permissions.IsGod(m_uuid)) | 6123 | if(IsGod) |
| 6124 | return true; | 6124 | return true; |
| 6125 | 6125 | ||
| 6126 | // respect region owner and managers | 6126 | // respect region owner and managers |