diff options
| author | McCabe Maxsted | 2010-08-02 00:44:57 -0700 |
|---|---|---|
| committer | McCabe Maxsted | 2010-08-02 00:44:57 -0700 |
| commit | 489ac5bdda11551401fae1ec63d4c7612ca3bbb1 (patch) | |
| tree | 8bacb54d32eb9713b3788d9d8dd5188bd6bdc297 /linden/indra/newview/llwindlightremotectrl.cpp | |
| parent | Removed unused ZHAO entries from the AO template and added it to cmake (diff) | |
| parent | Added loading kdu debugging info to the log (diff) | |
| download | meta-impy-489ac5bdda11551401fae1ec63d4c7612ca3bbb1.zip meta-impy-489ac5bdda11551401fae1ec63d4c7612ca3bbb1.tar.gz meta-impy-489ac5bdda11551401fae1ec63d4c7612ca3bbb1.tar.bz2 meta-impy-489ac5bdda11551401fae1ec63d4c7612ca3bbb1.tar.xz | |
Merge commit 'jacek/next' into weekly
Diffstat (limited to 'linden/indra/newview/llwindlightremotectrl.cpp')
| -rw-r--r-- | linden/indra/newview/llwindlightremotectrl.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/linden/indra/newview/llwindlightremotectrl.cpp b/linden/indra/newview/llwindlightremotectrl.cpp index 0beb3e5..b5c15a5 100644 --- a/linden/indra/newview/llwindlightremotectrl.cpp +++ b/linden/indra/newview/llwindlightremotectrl.cpp | |||
| @@ -173,8 +173,7 @@ void LLWindlightRemoteCtrl::refreshPresets() | |||
| 173 | mPresetsCombo->addSimpleElement(getString("midnight"), ADD_BOTTOM); | 173 | mPresetsCombo->addSimpleElement(getString("midnight"), ADD_BOTTOM); |
| 174 | mPresetsCombo->addSimpleElement(getString("revert_region"), ADD_BOTTOM); | 174 | mPresetsCombo->addSimpleElement(getString("revert_region"), ADD_BOTTOM); |
| 175 | 175 | ||
| 176 | if (mPresetsCombo->getSelectedItemLabel() != currentParams.mName && | 176 | if (!currentParams.mName.empty()) |
| 177 | !currentParams.mName.empty()) | ||
| 178 | { | 177 | { |
| 179 | mPresetsCombo->selectByValue(LLSD(currentParams.mName)); | 178 | mPresetsCombo->selectByValue(LLSD(currentParams.mName)); |
| 180 | } | 179 | } |