diff options
| author | UbitUmarov | 2014-08-04 00:43:57 +0100 |
|---|---|---|
| committer | UbitUmarov | 2014-08-04 00:43:57 +0100 |
| commit | 8cf945544cd993b68329d00832f7c9b74570af28 (patch) | |
| tree | ea317cda089e8c7e01e13077fc8038bff8ecd14d | |
| parent | missing child login parcel overlay (diff) | |
| download | opensim-SC_OLD-8cf945544cd993b68329d00832f7c9b74570af28.zip opensim-SC_OLD-8cf945544cd993b68329d00832f7c9b74570af28.tar.gz opensim-SC_OLD-8cf945544cd993b68329d00832f7c9b74570af28.tar.bz2 opensim-SC_OLD-8cf945544cd993b68329d00832f7c9b74570af28.tar.xz | |
local chat gods bug fix
| -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 71ceb65..dcfc630 100644 --- a/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs | |||
| @@ -236,7 +236,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat | |||
| 236 | fromName = avatar.Name; | 236 | fromName = avatar.Name; |
| 237 | fromID = c.Sender.AgentId; | 237 | fromID = c.Sender.AgentId; |
| 238 | if (avatar.GodLevel >= 200) | 238 | if (avatar.GodLevel >= 200) |
| 239 | { | 239 | { // let gods speak to outside or things may get confusing |
| 240 | fromNamePrefix = m_adminPrefix; | 240 | fromNamePrefix = m_adminPrefix; |
| 241 | checkParcelHide = false; | 241 | checkParcelHide = false; |
| 242 | } | 242 | } |
| @@ -310,7 +310,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat | |||
| 310 | // objects on a parcel with access restrictions | 310 | // objects on a parcel with access restrictions |
| 311 | if (checkParcelHide) | 311 | if (checkParcelHide) |
| 312 | { | 312 | { |
| 313 | if (sourceParcelID != Presencecheck.LandData.GlobalID) | 313 | if (sourceParcelID != Presencecheck.LandData.GlobalID && presence.GodLevel < 200) |
| 314 | return; | 314 | return; |
| 315 | } | 315 | } |
| 316 | if (c.Sender == null || Presencecheck.IsEitherBannedOrRestricted(c.Sender.AgentId) != true) | 316 | if (c.Sender == null || Presencecheck.IsEitherBannedOrRestricted(c.Sender.AgentId) != true) |