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

- changed : gray-out the "Sun" and "Enviroment Editor" submenus when @setenv=n restricted 

--HG--
branch : RLVa
meow-7.2.2
Kitty Barnett 2011-09-04 23:13:29 +02:00
parent 6add68046f
commit 8ce10d9d39
2 changed files with 44 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
indra/newview/rlvui.cpp
View File

@ -178,12 +178,13 @@ void RlvUIEnabler::onToggleSetDebug()
}
}
// Checked: 2010-03-17 (RLVa-1.2.0a) | Added: RLVa-1.2.0a
// Checked: 2011-09-04 (RLVa-1.4.1a) | Modified: RLVa-1.4.1a
void RlvUIEnabler::onToggleSetEnv()
{
bool fEnable = !gRlvHandler.hasBehaviour(RLV_BHVR_SETENV);
const std::string strEnvFloaters[] = { "env_day_cycle", /*"env_post_process",*/ "env_settings", "env_water", "env_windlight" };
const std::string strEnvFloaters[] =
{ "env_post_process", "env_settings", "env_delete_preset", "env_edit_sky", "env_edit_water", "env_edit_day_cycle" };
for (int idxFloater = 0, cntFloater = sizeof(strEnvFloaters) / sizeof(std::string); idxFloater < cntFloater; idxFloater++)
{
if (!fEnable)

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

@ -491,6 +491,9 @@
<menu_item_call.on_click
function="World.EnvSettings"
parameter="sunrise" />
<menu_item_call.on_enable
function="RLV.EnableIfNot"
parameter="setenv" />
</menu_item_call>
<menu_item_call
label="Midday"
@ -499,6 +502,9 @@
<menu_item_call.on_click
function="World.EnvSettings"
parameter="noon" />
<menu_item_call.on_enable
function="RLV.EnableIfNot"
parameter="setenv" />
</menu_item_call>
<menu_item_call
label="Sunset"
@ -507,6 +513,9 @@
<menu_item_call.on_click
function="World.EnvSettings"
parameter="sunset" />
<menu_item_call.on_enable
function="RLV.EnableIfNot"
parameter="setenv" />
</menu_item_call>
<menu_item_call
label="Midnight"
@ -514,6 +523,9 @@
<menu_item_call.on_click
function="World.EnvSettings"
parameter="midnight" />
<menu_item_call.on_enable
function="RLV.EnableIfNot"
parameter="setenv" />
</menu_item_call>
<menu_item_separator/>
<menu_item_call
@ -522,6 +534,9 @@
<menu_item_call.on_click
function="World.EnvSettings"
parameter="default" />
<menu_item_call.on_enable
function="RLV.EnableIfNot"
parameter="setenv" />
</menu_item_call>
</menu>
@ -538,6 +553,9 @@
<menu_item_call.on_click
function="World.EnvSettings"
parameter="editor"/>
<menu_item_call.on_enable
function="RLV.EnableIfNot"
parameter="setenv" />
</menu_item_call>
<menu_item_separator/>
@ -551,6 +569,9 @@
<menu_item_call.on_click
function="World.EnvPreset"
parameter="new_water"/>
<menu_item_call.on_enable
function="RLV.EnableIfNot"
parameter="setenv" />
</menu_item_call>
<menu_item_call
label="Edit preset..."
@ -558,7 +579,10 @@
<menu_item_call.on_click
function="World.EnvPreset"
parameter="edit_water"/>
</menu_item_call>
<menu_item_call.on_enable
function="RLV.EnableIfNot"
parameter="setenv" />
</menu_item_call>
<menu_item_call
label="Delete preset..."
name="delete_water_preset">
@ -580,14 +604,20 @@
<menu_item_call.on_click
function="World.EnvPreset"
parameter="new_sky"/>
</menu_item_call>
<menu_item_call.on_enable
function="RLV.EnableIfNot"
parameter="setenv" />
</menu_item_call>
<menu_item_call
label="Edit preset..."
name="edit_sky_preset">
<menu_item_call.on_click
function="World.EnvPreset"
parameter="edit_sky"/>
</menu_item_call>
<menu_item_call.on_enable
function="RLV.EnableIfNot"
parameter="setenv" />
</menu_item_call>
<menu_item_call
label="Delete preset..."
name="delete_sky_preset">
@ -609,14 +639,20 @@
<menu_item_call.on_click
function="World.EnvPreset"
parameter="new_day_cycle"/>
</menu_item_call>
<menu_item_call.on_enable
function="RLV.EnableIfNot"
parameter="setenv" />
</menu_item_call>
<menu_item_call
label="Edit preset..."
name="edit_day_preset">
<menu_item_call.on_click
function="World.EnvPreset"
parameter="edit_day_cycle"/>
</menu_item_call>
<menu_item_call.on_enable
function="RLV.EnableIfNot"
parameter="setenv" />
</menu_item_call>
<menu_item_call
label="Delete preset..."
name="delete_day_preset">