diff options
| author | Melanie | 2012-11-03 15:38:47 +0000 |
|---|---|---|
| committer | Melanie | 2012-11-03 15:38:47 +0000 |
| commit | d0473b73da024c67cb1eb4a420e5ce6de59c5da4 (patch) | |
| tree | 65ddc795b413c661f20f03bbe434e0194a8af6d5 /OpenSim/Region/CoreModules/Framework/EntityTransfer | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | HG: flip all configs to HG2.0. PLEASE CHECK YOUR EXISTING HG CONFIGS AGAINST ... (diff) | |
| download | opensim-SC-d0473b73da024c67cb1eb4a420e5ce6de59c5da4.zip opensim-SC-d0473b73da024c67cb1eb4a420e5ce6de59c5da4.tar.gz opensim-SC-d0473b73da024c67cb1eb4a420e5ce6de59c5da4.tar.bz2 opensim-SC-d0473b73da024c67cb1eb4a420e5ce6de59c5da4.tar.xz | |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/CoreModules/Framework/EntityTransfer')
| -rw-r--r-- | OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs index 0aee0d4..b16c37a 100644 --- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs +++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs | |||
| @@ -259,8 +259,8 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
| 259 | if (flags == -1 /* no region in DB */ || (flags & (int)OpenSim.Framework.RegionFlags.Hyperlink) != 0) | 259 | if (flags == -1 /* no region in DB */ || (flags & (int)OpenSim.Framework.RegionFlags.Hyperlink) != 0) |
| 260 | { | 260 | { |
| 261 | // this user is going to another grid | 261 | // this user is going to another grid |
| 262 | // check if HyperGrid teleport is allowed, based on user level | 262 | // for local users, check if HyperGrid teleport is allowed, based on user level |
| 263 | if (sp.UserLevel < m_levelHGTeleport) | 263 | if (Scene.UserManagementModule.IsLocalGridUser(sp.UUID) && sp.UserLevel < m_levelHGTeleport) |
| 264 | { | 264 | { |
| 265 | m_log.WarnFormat("[HG ENTITY TRANSFER MODULE]: Unable to HG teleport agent due to insufficient UserLevel."); | 265 | m_log.WarnFormat("[HG ENTITY TRANSFER MODULE]: Unable to HG teleport agent due to insufficient UserLevel."); |
| 266 | reason = "Hypergrid teleport not allowed"; | 266 | reason = "Hypergrid teleport not allowed"; |