diff options
| author | Andrew A. de Laix <alain@lindenlab.com> | 2010-12-20 11:34:06 -0800 |
|---|---|---|
| committer | Andrew A. de Laix <alain@lindenlab.com> | 2010-12-20 11:34:06 -0800 |
| commit | fdd5348f81d51363a1639de8b3cc4414fc0f4982 (patch) | |
| tree | ca17bfe907b534c7dafe27654487204d443fae68 /indra/newview | |
| parent | 2c68cb2c69348522ebb648aa4abd2ca7e4038b80 (diff) | |
Remove unimplemented software updater option. Fix potential double start of updater service.
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llviewercontrol.cpp | 3 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_preferences_setup.xml | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llviewercontrol.cpp b/indra/newview/llviewercontrol.cpp index 2c75551285..8c5a52c187 100644 --- a/indra/newview/llviewercontrol.cpp +++ b/indra/newview/llviewercontrol.cpp @@ -506,7 +506,8 @@ void toggle_updater_service_active(LLControlVariable* control, const LLSD& new_v { if(new_value.asInteger()) { - LLUpdaterService().startChecking(); + LLUpdaterService update_service; + if(!update_service.isChecking()) update_service.startChecking(); } else { diff --git a/indra/newview/skins/default/xui/en/panel_preferences_setup.xml b/indra/newview/skins/default/xui/en/panel_preferences_setup.xml index 542b6bcf6b..901a1257e0 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_setup.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_setup.xml @@ -367,10 +367,12 @@ label="Install automatically" name="Install_automatically" value="3" /> + <!-- <combo_box.item label="Ask before installing" name="Install_ask" value="1" /> + --> <combo_box.item label="Download and install updates manually" name="Install_manual" |