livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #122 from DarlCat/shared-environment-shortcircuit 

Option to short-circuit repeated environment keybinds to shared environment
master
Beq Janus 2025-05-23 10:31:11 +01:00 committed by GitHub
parent 479d55d4db 3be755904b
commit 29a97d83c3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 35 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
indra/newview/app_settings/settings.xml
View File

@ -26357,5 +26357,16 @@ Change of this parameter will affect the layout of buttons in notification toast
<key>Value</key>
<integer>1</integer>
</map>
<key>FSRepeatedEnvTogglesShared</key>
<map>
<key>Comment</key>
<string>Whether repeated presses of sky preset shortcuts should revert to shared environment</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
</map>
</llsd>

13
indra/newview/llviewermenu.cpp
View File

@ -11809,6 +11809,19 @@ class LLWorldEnvSettings : public view_listener_t
#endif
// </FS:Beq>
// <FS:Darl> Redundant environment toggles revert to shared environment
LLSettingsSky::ptr_t sky = LLEnvironment::instance().getEnvironmentFixedSky(LLEnvironment::ENV_LOCAL);
LLUUID skyid = (sky) ? sky->getAssetId() : LLUUID::null;
bool repeatedEnvTogglesShared = gSavedSettings.getBOOL("FSRepeatedEnvTogglesShared");
if(repeatedEnvTogglesShared && ((skyid == LLEnvironment::KNOWN_SKY_SUNRISE && event_name == "sunrise") ||
(skyid == LLEnvironment::KNOWN_SKY_MIDDAY && event_name == "noon") ||
(skyid == LLEnvironment::KNOWN_SKY_LEGACY_MIDDAY && event_name == "legacy noon") ||
(skyid == LLEnvironment::KNOWN_SKY_SUNSET && event_name == "sunset") ||
(skyid == LLEnvironment::KNOWN_SKY_MIDNIGHT && event_name == "midnight")))
event_name = "region";
// </FS:Darl>
if (event_name == "sunrise")
{
// <FS:Beq> FIRE-29926 - allow manually selected environments to have a user defined transition time.

11
indra/newview/skins/default/xui/en/panel_preferences_firestorm.xml
View File

@ -218,6 +218,17 @@
left="10"
width="500"
tool_tip="Restores the current environment settings after next login."/>
<check_box
top_pad="5"
control_name="FSRepeatedEnvTogglesShared"
follows="left|top"
height="16"
initial_value="true"
name="FSRepeatedEnvTogglesShared"
label="Repeated environment keybinds revert to shared environment"
left="10"
width="500"
tool_tip="Causes repeated keybinds (e.g. ctrl+shift+y) to alternate between the requested preset &amp; shared environment"/>
</panel>