summaryrefslogtreecommitdiff
path: root/indra/newview/llappviewer.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/llappviewer.cpp')
-rw-r--r--indra/newview/llappviewer.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index 386ffe9601..139f8dd426 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -6006,9 +6006,10 @@ void LLAppViewer::setPermitOSHibernation(bool permit)
}
else
{
+ // User is active, check settings and set OS hibernation mode accordingly
static LLCachedControl<S32> os_hibernation_mode(gSavedSettings, "OSHibernationMode", 0);
eHibernationMode mode = static_cast<eHibernationMode>(os_hibernation_mode());
- if (mode != LL_HIBERNATE_MODE_DEFAULT && mCurrentHibernationMode != mode)
+ if (mCurrentHibernationMode != mode)
{
setOSHibernationMode(mode);
mCurrentHibernationMode = mode;