aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorUbitUmarov2014-08-02 22:45:28 +0100
committerUbitUmarov2014-08-02 22:45:28 +0100
commite87f70e277e78fb37100b2750fcb09b3aacb1734 (patch)
treec4f1bba22121b1059ba2301332e9c24f0dc416a2 /OpenSim/Region
parentlet gods see hidden avatars ( test ) (diff)
downloadopensim-SC-e87f70e277e78fb37100b2750fcb09b3aacb1734.zip
opensim-SC-e87f70e277e78fb37100b2750fcb09b3aacb1734.tar.gz
opensim-SC-e87f70e277e78fb37100b2750fcb09b3aacb1734.tar.bz2
opensim-SC-e87f70e277e78fb37100b2750fcb09b3aacb1734.tar.xz
god also read local chat
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs7
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs2
2 files changed, 7 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs b/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
index 9b41083..71ceb65 100644
--- a/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
@@ -238,10 +238,15 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
238 if (avatar.GodLevel >= 200) 238 if (avatar.GodLevel >= 200)
239 { 239 {
240 fromNamePrefix = m_adminPrefix; 240 fromNamePrefix = m_adminPrefix;
241 checkParcelHide = false;
242 }
243 else
244 {
245 checkParcelHide = true;
241 } 246 }
242 destination = UUID.Zero; // Avatars cant "SayTo" 247 destination = UUID.Zero; // Avatars cant "SayTo"
243 ownerID = c.Sender.AgentId; 248 ownerID = c.Sender.AgentId;
244 checkParcelHide = true; 249
245 hidePos = fromPos; 250 hidePos = fromPos;
246 break; 251 break;
247 252
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 3bdfb32..5327b82 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -3972,7 +3972,7 @@ namespace OpenSim.Region.Framework.Scenes
3972 3972
3973 if(oldgodlevel != GodLevel) // force a visibility check 3973 if(oldgodlevel != GodLevel) // force a visibility check
3974 ParcelCrossCheck(m_currentParcelUUID, m_previusParcelUUID, 3974 ParcelCrossCheck(m_currentParcelUUID, m_previusParcelUUID,
3975 true, m_previusParcelHide, false, true); 3975 m_currentParcelHide , m_previusParcelHide, false, true);
3976 } 3976 }
3977 3977
3978 #region Child Agent Updates 3978 #region Child Agent Updates