Merge tag 'Second_Life_Release#f7672193-26.4' into 26.4

1 files changed, 3 insertions, 9 deletions

diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp
index a521170c61..b29d1706c4 100644
--- a/indra/newview/llagent.cpp
+++ b/indra/newview/llagent.cpp
@@ -583,6 +583,9 @@ void LLAgent::setFirstLogin(bool b)
         {
             setFeatureVersion(UI_FEATURE_VERSION, UI_FEATURE_FLAGS);
         }
+
+        // Shared environment on teleport should only be enabled by default for new users;
+        gSavedSettings.setBOOL("SwitchToSharedEnvAfterTeleport", true);
     }
 }
 
@@ -1566,8 +1569,6 @@ void LLAgent::setAFK()
         setControlFlags(AGENT_CONTROL_AWAY | AGENT_CONTROL_STOP);
         gAwayTimer.start();
     }
-
-    LLAppViewer::instance()->setPermitOSHibernation(true);
 }
 
 //-----------------------------------------------------------------------------
@@ -1586,13 +1587,6 @@ void LLAgent::clearAFK()
         sendAnimationRequest(ANIM_AGENT_AWAY, ANIM_REQUEST_STOP);
         clearControlFlags(AGENT_CONTROL_AWAY);
     }
-
-    if (isAgentAvatarValid())
-    {
-        // Only set this if agent is inworld, login screen
-        // shouldn't prevent hibernation.
-        LLAppViewer::instance()->setPermitOSHibernation(false);
-    }
 }
 
 //-----------------------------------------------------------------------------