diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-07-11 06:11:49 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-07-11 06:11:49 -0400 |
| commit | f34e5f761fee4c3ae1af007821a9baafbb390683 (patch) | |
| tree | 2f5c5690baaea01539876d41b2240a3b48e99404 /indra | |
| parent | b40a44d24d7e59d9102f603a28ab329046e34b5d (diff) | |
| parent | 20dfccba4e88c525227e519bd884aeb1effdb480 (diff) | |
merge changes for storm-1483
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llfloaterdeleteenvpreset.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llfloaterdeleteenvpreset.cpp b/indra/newview/llfloaterdeleteenvpreset.cpp index 4fefd2242a..d08aa81cfe 100644 --- a/indra/newview/llfloaterdeleteenvpreset.cpp +++ b/indra/newview/llfloaterdeleteenvpreset.cpp @@ -258,7 +258,7 @@ void LLFloaterDeleteEnvPreset::populateDayCyclesList() void LLFloaterDeleteEnvPreset::postPopulate() { // Handle empty list and empty selection. - bool has_selection = mPresetCombo->getItemCount() > 1 && mPresetCombo->getSelectedValue().isDefined(); + bool has_selection = mPresetCombo->getItemCount() > 0 && mPresetCombo->getSelectedValue().isDefined(); if (!has_selection) { |