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

FIRE-14011: Fix Firestorm-specific windlight menu item issues introduced in viewer-interesting merge

Ansariel 2014-06-27 14:03:22 +02:00
parent d081cce5e0
commit e979139e2b
2 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
indra/newview/llviewermenu.cpp
View File

@ -10025,12 +10025,6 @@ class LLWorldEnvSettings : public view_listener_t
{
LLEnvManagerNew::instance().setUseSkyPreset("Midnight");
}
// [RLVa:KB] - Checked: 2011-09-03 (RLVa-1.4.1a) | Added: RLVa-1.4.1a
else if ("default" == tod)
{
LLEnvManagerNew::instance().setUseRegionSettings(true);
}
// [/RLVa:KB]
else
{
LLEnvManagerNew &envmgr = LLEnvManagerNew::instance();

16
indra/newview/skins/default/xui/en/menu_viewer.xml
View File

@ -957,13 +957,13 @@
label="Sunrise"
name="Sunrise"
shortcut="control|shift|U">
<menu_item_call.on_click
<menu_item_check.on_click
function="World.EnvSettings"
parameter="sunrise" />
<menu_item_check.on_check
function="World.EnableEnvSettings"
parameter="sunrise" />
<menu_item_call.on_enable
<menu_item_check.on_enable
function="RLV.EnableIfNot"
parameter="setenv" />
</menu_item_check>
@ -977,7 +977,7 @@
<menu_item_check.on_check
function="World.EnableEnvSettings"
parameter="noon" />
<menu_item_call.on_enable
<menu_item_check.on_enable
function="RLV.EnableIfNot"
parameter="setenv" />
</menu_item_check>
@ -991,7 +991,7 @@
<menu_item_check.on_check
function="World.EnableEnvSettings"
parameter="sunset" />
<menu_item_call.on_enable
<menu_item_check.on_enable
function="RLV.EnableIfNot"
parameter="setenv" />
</menu_item_check>
@ -999,13 +999,13 @@
label="Midnight"
name="Midnight"
shortcut="control|shift|X">
<menu_item_call.on_click
<menu_item_check.on_click
function="World.EnvSettings"
parameter="midnight" />
<menu_item_check.on_check
function="World.EnableEnvSettings"
parameter="midnight" />
<menu_item_call.on_enable
<menu_item_check.on_enable
function="RLV.EnableIfNot"
parameter="setenv" />
</menu_item_check>
@ -1015,11 +1015,11 @@
name="Revert to Region Default">
<menu_item_check.on_click
function="World.EnvSettings"
parameter="default" />
parameter="region" />
<menu_item_check.on_check
function="World.EnableEnvSettings"
parameter="region" />
<menu_item_call.on_enable
<menu_item_check.on_enable
function="RLV.EnableIfNot"
parameter="setenv" />
</menu_item_check>