OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs

@@ -97,10 +97,8 @@ namespace OpenSim.Region.CoreModules.Avatar.UserProfiles
                         {
                             ScenePresence p = req.presence;
 
-                            bool ok = true;
                             bool foreign = GetUserProfileServerURI(req.agent, out string serverURI);
-                            if(serverURI.Length == 0)
-                                ok = false;
+                            bool ok  = serverURI.Length > 0;
 
                             Byte[] membershipType = new Byte[1];
                             string born = string.Empty;

OpenSim/Region/Framework/Scenes/GodController.cs

@@ -242,8 +242,8 @@ namespace OpenSim.Region.Framework.Scenes
                 OSDMap s = (OSDMap)state;
                 if (s.TryGetValue("ViewerUiIsGod", out OSD tmp))
                     newstate = tmp.AsBoolean();
-                m_lastLevelToViewer = m_viewergodlevel; // we are not changing viewer level by default
-            }       
+                m_lastLevelToViewer = newstate && m_viewergodlevel < 200 ? 200 : m_viewergodlevel;
+            }
             UpdateGodLevels(newstate);
         }
 

OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs

@@ -26,7 +26,6 @@
  */
 
 using System;
-using System.IO;
 using System.Reflection;
 using OpenMetaverse;
 using log4net;