#5856 An option to prevent hibernation#5879
Draft
akleshchev wants to merge 2 commits into
Draft
Conversation
Contributor
There was a problem hiding this comment.
Pull request overview
This PR adds a user-facing preference to control whether the viewer should prevent the host OS from sleeping/hibernating when the user is not Away, and wires that setting through to per-platform implementations (Windows/macOS/Linux). It also adjusts build configuration to surface platform-specific sources in IDEs.
Changes:
- Added a new Preferences UI combo box backed by a new saved setting (
OSHibernationMode). - Implemented OS sleep/hibernation prevention hooks on Windows/macOS/Linux and toggled behavior based on Away state.
- Updated CMake targets to include platform-specific files for IDE visibility.
Reviewed changes
Copilot reviewed 16 out of 16 changed files in this pull request and generated 9 comments.
Show a summary per file
| File | Description |
|---|---|
| indra/newview/skins/default/xui/en/panel_preferences_setup.xml | Adds UI for selecting OS hibernation prevention mode. |
| indra/newview/llviewerwindow.cpp | Changes suspend handling to send stats and optionally disconnect depending on mode. |
| indra/newview/llappviewerwin32.h | Declares Windows override hook for OS hibernation mode. |
| indra/newview/llappviewerwin32.cpp | Implements Windows sleep/hibernate inhibition via SetThreadExecutionState. |
| indra/newview/llappviewermacosx.h | Declares macOS hook for OS hibernation mode. |
| indra/newview/llappviewermacosx.cpp | Calls into Objective-C++ implementation to apply the mode; restores behavior on cleanup. |
| indra/newview/llappviewermacosx-objc.mm | Implements macOS power assertions for inhibiting sleep/display sleep. |
| indra/newview/llappviewermacosx-objc.h | Declares the Objective-C++ bridge function for hibernation mode changes. |
| indra/newview/llappviewerlinux.h | Declares Linux hook and helper state for power inhibition. |
| indra/newview/llappviewerlinux.cpp | Implements Linux D-Bus-based inhibition/uninhibition logic and lifecycle cleanup. |
| indra/newview/llappviewer.h | Adds eHibernationMode, platform hook, and a connection member for settings change tracking. |
| indra/newview/llappviewer.cpp | Applies mode on login/disconnect/Away transitions; updates stats sending signature. |
| indra/newview/llagent.cpp | Toggles permit/deny behavior when entering/leaving Away. |
| indra/newview/CMakeLists.txt | Adds platform source lists for IDE visibility and exclusion from other platforms. |
| indra/newview/app_settings/settings.xml | Adds the persisted OSHibernationMode saved setting. |
| indra/llwindow/CMakeLists.txt | Adds platform file lists for IDE visibility and exclusion from other platforms. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Comment on lines
+109
to
+120
| else if (mode == 2) | ||
| { | ||
| // Prevent OS from sleeping/hibernating, prevent screen from going off | ||
| CFStringRef assertionName = CFSTR("Second Life Viewer"); | ||
| // kIOPMAssertionTypeNoIdleSleep prevents idle sleep | ||
| // kIOPMAssertionTypeNoDisplaySleep prevents display sleep | ||
| IOReturn result = IOPMAssertionCreateWithName( | ||
| kIOPMAssertionTypeNoDisplaySleep, | ||
| kIOPMAssertionLevelOn, | ||
| assertionName, | ||
| &gPowerAssertionID | ||
| ); |
Contributor
Author
There was a problem hiding this comment.
according to macos's documentation: the idle display will not sleep when enabled, and consequently the system will not idle sleep.
https://developer.apple.com/documentation/iokit/kiopmassertiontypenodisplaysleep
Comment on lines
+259
to
+263
| width="300"> | ||
| Prevent OS from hibernating if not Away: | ||
| </text> | ||
| <combo_box | ||
| control_name="OSHibernationMode" |
akleshchev
force-pushed
the
andreyk/viewer_5856
branch
from
75d7005 to
87d650a
Compare
akleshchev
force-pushed
the
andreyk/viewer_5856
branch
from
87d650a to
6f5c1c0
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Draft as it needs a bit more work and testing, for now only built it on windows.