From effa32cfa4cc252e9d52d536af510b4e1e92337c Mon Sep 17 00:00:00 2001
From: UbitUmarov
Date: Sat, 7 Jan 2017 18:41:46 +0000
Subject: replace godlevel compares by the new faster bool isViewerUIGod
---
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | 2 +-
OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs | 4 ++--
OpenSim/Region/CoreModules/Avatar/Friends/CallingCardModule.cs | 2 +-
OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs | 2 +-
OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs | 2 +-
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 6 +++---
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LS_Api.cs | 6 +++---
.../ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs | 2 +-
8 files changed, 13 insertions(+), 13 deletions(-)
(limited to 'OpenSim')
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index 316956b..2bcb3bc 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -11455,7 +11455,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
ScenePresence p;
if (scene.TryGetScenePresence(sender.AgentId, out p))
{
- if (p.GodController.GodLevel >= 200)
+ if (p.isViewerUIGod)
{
groupProfileReply.GroupData.OpenEnrollment = true;
groupProfileReply.GroupData.MembershipFee = 0;
diff --git a/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs b/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
index adf5c68..5579dd0 100644
--- a/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
@@ -229,7 +229,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
fromPos = avatar.AbsolutePosition;
fromName = avatar.Name;
fromID = c.Sender.AgentId;
- if (avatar.GodController.GodLevel >= 200)
+ if (avatar.isViewerUIGod)
{ // let gods speak to outside or things may get confusing
fromNamePrefix = m_adminPrefix;
checkParcelHide = false;
@@ -305,7 +305,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
{
if (checkParcelHide)
{
- if (sourceParcelID != Presencecheck.LandData.GlobalID && presence.GodController.GodLevel < 200)
+ if (sourceParcelID != Presencecheck.LandData.GlobalID && !presence.isViewerUIGod)
return;
}
if (c.Sender == null || Presencecheck.IsEitherBannedOrRestricted(c.Sender.AgentId) != true)
diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/CallingCardModule.cs b/OpenSim/Region/CoreModules/Avatar/Friends/CallingCardModule.cs
index 9843f2e..58fa42d 100644
--- a/OpenSim/Region/CoreModules/Avatar/Friends/CallingCardModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Friends/CallingCardModule.cs
@@ -118,7 +118,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
// If we're in god mode, we reverse the meaning. Offer
// calling card becomes "Take a calling card" for that
// person, no matter if they agree or not.
- if (sp.GodController.GodLevel >= 200)
+ if (sp.isViewerUIGod)
{
CreateCallingCard(client.AgentId, destID, UUID.Zero, true);
return;
diff --git a/OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs b/OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
index 8116b3c..9664ae5 100644
--- a/OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
@@ -173,7 +173,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Gods
sp.GrantGodlikePowers(token, godLike);
- if (godLike && sp.GodController.GodLevel < 200 && DialogModule != null)
+ if (godLike && !sp.isViewerUIGod && DialogModule != null)
DialogModule.SendAlertToUser(agentID, "Request for god powers denied");
}
diff --git a/OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs b/OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs
index bd95ff0..9c80d0a 100644
--- a/OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs
@@ -169,7 +169,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Lure
GridInstantMessage m;
- if (scene.Permissions.IsAdministrator(client.AgentId) && presence.GodController.GodLevel >= 200 && (!scene.Permissions.IsAdministrator(targetid)))
+ if (scene.Permissions.IsAdministrator(client.AgentId) && presence.isViewerUIGod && (!scene.Permissions.IsAdministrator(targetid)))
{
m = new GridInstantMessage(scene, client.AgentId,
client.FirstName+" "+client.LastName, targetid,
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 92d6808..51ab5fd 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -5029,7 +5029,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
else
{
// agent must not be a god
- if (presence.GodController.GodLevel >= 200) return;
+ if (presence.isViewerUIGod) return;
// agent must be over the owners land
ILandObject agentLand = World.LandChannel.GetLandObject(presence.AbsolutePosition);
@@ -5256,7 +5256,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
return;
// Pushee is in GodMode this pushing object isn't owned by them
- if (avatar.GodController.GodLevel > 0 && m_host.OwnerID != targetID)
+ if (avatar.isViewerUIGod && m_host.OwnerID != targetID)
return;
pusheeav = avatar;
@@ -6687,7 +6687,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
delegate (ScenePresence ssp)
{
// Gods are not listed in SL
- if (!ssp.IsDeleted && ssp.GodController.GodLevel == 0.0 && !ssp.IsChildAgent)
+ if (!ssp.IsDeleted && !ssp.isViewerUIGod && !ssp.IsChildAgent)
{
if (!regionWide)
{
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LS_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LS_Api.cs
index 49e70bc..40ad291 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LS_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LS_Api.cs
@@ -721,7 +721,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
{
ScenePresence sp = World.GetScenePresence(m_host.OwnerID);
- if (sp == null || sp.GodController.GodLevel < 200)
+ if (sp == null || !sp.isViewerUIGod)
{
LSShoutError("lsSetWindlightScene can only be used by estate managers or owners.");
return 0;
@@ -768,7 +768,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
{
ScenePresence sp = World.GetScenePresence(m_host.OwnerID);
- if (sp == null || sp.GodController.GodLevel < 200)
+ if (sp == null || !sp.isViewerUIGod)
{
LSShoutError("lsSetWindlightScene can only be used by estate managers or owners.");
return;
@@ -799,7 +799,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
{
ScenePresence sp = World.GetScenePresence(m_host.OwnerID);
- if (sp == null || sp.GodController.GodLevel < 200)
+ if (sp == null || !sp.isViewerUIGod)
{
LSShoutError("lsSetWindlightSceneTargeted can only be used by estate managers or owners.");
return 0;
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
index c7e7f89..bd53700 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
@@ -540,7 +540,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
}
}
- if (presence.IsDeleted || presence.IsChildAgent || presence.GodController.GodLevel > 0.0)
+ if (presence.IsDeleted || presence.IsChildAgent || presence.isViewerUIGod)
return;
// if the object the script is in is attached and the avatar is the owner
--
cgit v1.1