OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix typo

melanie
UbitUmarov 2017-01-06 03:07:17 +00:00
parent 8eb7c9d0fb
commit 7ac74fcf73
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
OpenSim/Region/Framework/Scenes/GodController.cs
View File

@ -124,26 +124,24 @@ namespace OpenSim.Region.Framework.Scenes
protected bool CanBeGod() protected bool CanBeGod()
{ {
bool canBeGod = false;
if (m_allowGridGods && m_userLevel > 0) if (m_allowGridGods && m_userLevel > 0)
canBeGod = true; return true;
if (m_regionOwnerIsGod && m_scene.RegionInfo.EstateSettings.IsEstateOwner(m_scenePresence.UUID)) if (m_regionOwnerIsGod && m_scene.RegionInfo.EstateSettings.IsEstateOwner(m_scenePresence.UUID))
canBeGod = true; return true;
if (m_regionManagerIsGod && m_scene.Permissions.IsEstateManager(m_scenePresence.UUID)) if (m_regionManagerIsGod && m_scene.Permissions.IsEstateManager(m_scenePresence.UUID))
canBeGod = true; return true;
if (!canBeGod && m_parcelOwnerIsGod) // Skip expensive check if we're already god! if (m_parcelOwnerIsGod) // Skip expensive check if we're already god!
{ {
Vector3 pos = m_scenePresence.AbsolutePosition; Vector3 pos = m_scenePresence.AbsolutePosition;
ILandObject parcel = m_scene.LandChannel.GetLandObject(pos.X, pos.Y); ILandObject parcel = m_scene.LandChannel.GetLandObject(pos.X, pos.Y);
if (parcel != null && parcel.LandData.OwnerID == m_scenePresence.UUID) if (parcel != null && parcel.LandData.OwnerID == m_scenePresence.UUID)
canBeGod = true; return true;
} }
return canBeGod; return false;
} }
public void SyncViewerState() public void SyncViewerState()
@ -211,7 +209,7 @@ namespace OpenSim.Region.Framework.Scenes
public int UserLevel public int UserLevel
{ {
get { return m_userLevel; } get { return m_userLevel; }
set { m_userLevel = UserLevel; } set { m_userLevel = value; }
} }
public int GodLevel public int GodLevel