diff options
| author | McCabe Maxsted | 2009-11-09 08:26:33 -0700 |
|---|---|---|
| committer | McCabe Maxsted | 2009-11-09 08:26:33 -0700 |
| commit | 7bc775c026c17780e12a90b8db48639b03fcc113 (patch) | |
| tree | 6fd80e0d553c30c2f08e6331055d2225a73194ba /linden/indra/newview | |
| parent | Added Geneko Nemeth and Lilly Zenovka to About > Imprudence (diff) | |
| parent | Merge remote branch 'mccabe/next' into next (diff) | |
| download | meta-impy-7bc775c026c17780e12a90b8db48639b03fcc113.zip meta-impy-7bc775c026c17780e12a90b8db48639b03fcc113.tar.gz meta-impy-7bc775c026c17780e12a90b8db48639b03fcc113.tar.bz2 meta-impy-7bc775c026c17780e12a90b8db48639b03fcc113.tar.xz | |
Merge commit 'jacek/next' into next
Diffstat (limited to 'linden/indra/newview')
| -rw-r--r-- | linden/indra/newview/llwindlightremotectrl.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/linden/indra/newview/llwindlightremotectrl.cpp b/linden/indra/newview/llwindlightremotectrl.cpp index f805763..20de2f5 100644 --- a/linden/indra/newview/llwindlightremotectrl.cpp +++ b/linden/indra/newview/llwindlightremotectrl.cpp | |||
| @@ -154,11 +154,11 @@ void LLWindlightRemoteCtrl::refreshPresets() | |||
| 154 | } | 154 | } |
| 155 | 155 | ||
| 156 | // insert separator and add World menu options | 156 | // insert separator and add World menu options |
| 157 | mPresetsCombo->addSeparator(ADD_BOTTOM); | 157 | // mPresetsCombo->addSeparator(ADD_BOTTOM); |
| 158 | mPresetsCombo->addSimpleElement(getString("atmosphere"), ADD_BOTTOM); | 158 | // mPresetsCombo->addSimpleElement(getString("atmosphere"), ADD_BOTTOM); |
| 159 | mPresetsCombo->addSimpleElement(getString("lighting"), ADD_BOTTOM); | 159 | // mPresetsCombo->addSimpleElement(getString("lighting"), ADD_BOTTOM); |
| 160 | mPresetsCombo->addSimpleElement(getString("clouds"), ADD_BOTTOM); | 160 | // mPresetsCombo->addSimpleElement(getString("clouds"), ADD_BOTTOM); |
| 161 | mPresetsCombo->addSimpleElement(getString("advanced_water"), ADD_BOTTOM); | 161 | // mPresetsCombo->addSimpleElement(getString("advanced_water"), ADD_BOTTOM); |
| 162 | mPresetsCombo->addSeparator(ADD_BOTTOM); | 162 | mPresetsCombo->addSeparator(ADD_BOTTOM); |
| 163 | mPresetsCombo->addSimpleElement(getString("sunrise"), ADD_BOTTOM); | 163 | mPresetsCombo->addSimpleElement(getString("sunrise"), ADD_BOTTOM); |
| 164 | mPresetsCombo->addSimpleElement(getString("noon"), ADD_BOTTOM); | 164 | mPresetsCombo->addSimpleElement(getString("noon"), ADD_BOTTOM); |