From d6b3413c6337f8409b78266ac987aac63a5f77e5 Mon Sep 17 00:00:00 2001
From: UbitUmarov
Date: Wed, 20 Mar 2019 15:09:53 +0000
Subject: RegionHandshake IS critical llupd protocol not to be done by odd
 modules

---
 OpenSim/Framework/EstateSettings.cs | 8 ++++----
 OpenSim/Framework/IClientAPI.cs     | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'OpenSim/Framework')

diff --git a/OpenSim/Framework/EstateSettings.cs b/OpenSim/Framework/EstateSettings.cs
index 1b5ebfa..1c0b97a 100644
--- a/OpenSim/Framework/EstateSettings.cs
+++ b/OpenSim/Framework/EstateSettings.cs
@@ -153,7 +153,7 @@ namespace OpenSim.Framework
         private bool m_DenyAnonymous = false;
         public bool DenyAnonymous
         {
-            get { return m_DenyAnonymous; }
+            get { return (DoDenyAnonymous && m_DenyAnonymous); }
             set { m_DenyAnonymous = value; }
         }
 
@@ -233,7 +233,7 @@ namespace OpenSim.Framework
         private bool m_DenyMinors = false;
         public bool DenyMinors
         {
-            get { return m_DenyMinors; }
+            get { return (DoDenyMinors && m_DenyMinors); }
             set { m_DenyMinors = value; }
         }
 
@@ -379,14 +379,14 @@ namespace OpenSim.Framework
 
                 if (!HasAccess(avatarID))
                 {
-                    if (DoDenyMinors && DenyMinors)
+                    if (DenyMinors)
                     {
                         if ((userFlags & 32) == 0)
                         {
                             return true;
                         }
                     }
-                    if (DoDenyAnonymous && DenyAnonymous)
+                    if (DenyAnonymous)
                     {
                         if ((userFlags & 4) == 0)
                         {
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index 63e3782..0c5224b 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -1106,7 +1106,7 @@ namespace OpenSim.Framework
 //        void SendPartFullUpdate(ISceneEntity ent, uint? parentID);
 
         void SendAnimations(UUID[] animID, int[] seqs, UUID sourceAgentId, UUID[] objectIDs);
-        void SendRegionHandshake(RegionInfo regionInfo, RegionHandshakeArgs args);
+        void SendRegionHandshake();
 
         /// <summary>
         /// Send chat to the viewer.
-- 
cgit v1.1