diff options
| author | Armin Weatherwax | 2010-08-27 00:21:48 +0200 |
|---|---|---|
| committer | McCabe Maxsted | 2010-08-29 01:28:55 -0700 |
| commit | e409e98f417a09ceae4978bf5eba23f5c527befc (patch) | |
| tree | ecfcdb99dcc21ae87cb3a8ebede80aba192f0b6a | |
| parent | Katharine Berry: We can save inventory presets to inventory directly. How exc... (diff) | |
| download | meta-impy-e409e98f417a09ceae4978bf5eba23f5c527befc.zip meta-impy-e409e98f417a09ceae4978bf5eba23f5c527befc.tar.gz meta-impy-e409e98f417a09ceae4978bf5eba23f5c527befc.tar.bz2 meta-impy-e409e98f417a09ceae4978bf5eba23f5c527befc.tar.xz | |
Katharine Berry: Don't let people add notecarded windlight entries to the day cycle editor.
| -rw-r--r-- | linden/indra/newview/llfloaterdaycycle.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/linden/indra/newview/llfloaterdaycycle.cpp b/linden/indra/newview/llfloaterdaycycle.cpp index 58876a8..cfe73ef 100644 --- a/linden/indra/newview/llfloaterdaycycle.cpp +++ b/linden/indra/newview/llfloaterdaycycle.cpp | |||
| @@ -76,7 +76,8 @@ LLFloaterDayCycle::LLFloaterDayCycle() : LLFloater(std::string("Day Cycle Floate | |||
| 76 | LLWLParamManager::instance()->mParamList.begin(); | 76 | LLWLParamManager::instance()->mParamList.begin(); |
| 77 | for(; mIt != LLWLParamManager::instance()->mParamList.end(); mIt++) | 77 | for(; mIt != LLWLParamManager::instance()->mParamList.end(); mIt++) |
| 78 | { | 78 | { |
| 79 | keyCombo->add(std::string(mIt->first)); | 79 | if(mIt->second.mInventoryID.isNull()) |
| 80 | keyCombo->add(std::string(mIt->first)); | ||
| 80 | } | 81 | } |
| 81 | 82 | ||
| 82 | // set defaults on combo boxes | 83 | // set defaults on combo boxes |