diff options
| author | Vadim ProductEngine <vsavchuk@productengine.com> | 2011-05-30 22:34:56 +0300 |
|---|---|---|
| committer | Vadim ProductEngine <vsavchuk@productengine.com> | 2011-05-30 22:34:56 +0300 |
| commit | 657e434fd59139436e8b97e5ecd01ca686e82269 (patch) | |
| tree | bebf0c4c8adff3587cec47f6403757f841f5c872 /indra/newview/llfloaterwindlight.cpp | |
| parent | 6f1cdd4926444567d21b1d6e0735a445b981e56b (diff) | |
STORM-1253 WIP New day cycle editor.
Done:
* Creating new local day cycles.
* Editing existing local day cycles.
* Deleting day cycles.
To do:
* Editing region day cycle, dealing with skies in region scope.
* Handle teleport while editing a day cycle.
* Update UI when a day cycle or sky preset gets deleted.
* Make the time ctrl increase/decrease consistently.
Diffstat (limited to 'indra/newview/llfloaterwindlight.cpp')
| -rw-r--r-- | indra/newview/llfloaterwindlight.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/indra/newview/llfloaterwindlight.cpp b/indra/newview/llfloaterwindlight.cpp index fb69e6f594..16cb0f5e57 100644 --- a/indra/newview/llfloaterwindlight.cpp +++ b/indra/newview/llfloaterwindlight.cpp @@ -82,7 +82,13 @@ BOOL LLFloaterWindLight::postBuild() LLWLParamManager::getInstance()->mParamList.begin(); for(; mIt != LLWLParamManager::getInstance()->mParamList.end(); mIt++) { - comboBox->add(mIt->first.toString(), mIt->first.toLLSD()); + const LLWLParamKey& key = mIt->first; + std::string item_title = key.name; + if (key.scope == LLEnvKey::SCOPE_REGION) + { + item_title += std::string(" (") + LLTrans::getString("Region") + std::string(")"); + } + comboBox->add(item_title, key.toLLSD()); } // entry for when we're in estate time |