diff options
author | UbitUmarov | 2017-01-07 18:41:46 +0000 |
---|---|---|
committer | UbitUmarov | 2017-01-07 18:41:46 +0000 |
commit | effa32cfa4cc252e9d52d536af510b4e1e92337c (patch) | |
tree | 58696b3dc64598d9b17c7c9b2da80dd93e8db133 /OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs | |
parent | rename same variables to make their meaning more clear (diff) | |
download | opensim-SC_OLD-effa32cfa4cc252e9d52d536af510b4e1e92337c.zip opensim-SC_OLD-effa32cfa4cc252e9d52d536af510b4e1e92337c.tar.gz opensim-SC_OLD-effa32cfa4cc252e9d52d536af510b4e1e92337c.tar.bz2 opensim-SC_OLD-effa32cfa4cc252e9d52d536af510b4e1e92337c.tar.xz |
replace godlevel compares by the new faster bool isViewerUIGod
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs | 4 |
1 files changed, 2 insertions, 2 deletions
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 | |||
229 | fromPos = avatar.AbsolutePosition; | 229 | fromPos = avatar.AbsolutePosition; |
230 | fromName = avatar.Name; | 230 | fromName = avatar.Name; |
231 | fromID = c.Sender.AgentId; | 231 | fromID = c.Sender.AgentId; |
232 | if (avatar.GodController.GodLevel >= 200) | 232 | if (avatar.isViewerUIGod) |
233 | { // let gods speak to outside or things may get confusing | 233 | { // let gods speak to outside or things may get confusing |
234 | fromNamePrefix = m_adminPrefix; | 234 | fromNamePrefix = m_adminPrefix; |
235 | checkParcelHide = false; | 235 | checkParcelHide = false; |
@@ -305,7 +305,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat | |||
305 | { | 305 | { |
306 | if (checkParcelHide) | 306 | if (checkParcelHide) |
307 | { | 307 | { |
308 | if (sourceParcelID != Presencecheck.LandData.GlobalID && presence.GodController.GodLevel < 200) | 308 | if (sourceParcelID != Presencecheck.LandData.GlobalID && !presence.isViewerUIGod) |
309 | return; | 309 | return; |
310 | } | 310 | } |
311 | if (c.Sender == null || Presencecheck.IsEitherBannedOrRestricted(c.Sender.AgentId) != true) | 311 | if (c.Sender == null || Presencecheck.IsEitherBannedOrRestricted(c.Sender.AgentId) != true) |