diff options
| -rw-r--r-- | indra/newview/llfloaterdeleteprefpreset.cpp | 14 | ||||
| -rw-r--r-- | indra/newview/llfloatersaveprefpreset.cpp | 4 | ||||
| -rwxr-xr-x | indra/newview/skins/default/xui/en/notifications.xml | 4 | ||||
| -rwxr-xr-x | indra/newview/skins/default/xui/en/strings.xml | 2 |
4 files changed, 21 insertions, 3 deletions
diff --git a/indra/newview/llfloaterdeleteprefpreset.cpp b/indra/newview/llfloaterdeleteprefpreset.cpp index 50abf1038b..73b3474e5c 100644 --- a/indra/newview/llfloaterdeleteprefpreset.cpp +++ b/indra/newview/llfloaterdeleteprefpreset.cpp @@ -69,7 +69,11 @@ void LLFloaterDeletePrefPreset::onBtnDelete() if (LLPresetsManager::getInstance()->deletePreset(mSubdirectory, name)) { + std::string preset = mSubdirectory; + preset[0] = std::toupper(preset[0]); + LLSD args; + args["TYPE"] = preset; args["NAME"] = name; LLNotificationsUtil::add("PresetDeleted", args); } @@ -78,9 +82,19 @@ void LLFloaterDeletePrefPreset::onBtnDelete() void LLFloaterDeletePrefPreset::onPresetsListChange() { LLComboBox* combo = getChild<LLComboBox>("preset_combo"); + LLButton* delete_btn = getChild<LLButton>("delete"); EDefaultOptions option = DEFAULT_HIDE; LLPresetsManager::getInstance()->setPresetNamesInComboBox(mSubdirectory, combo, option); + + if(0 != combo->getItemCount()) + { + delete_btn->setEnabled(TRUE); + } + else + { + delete_btn->setEnabled(FALSE); + } } void LLFloaterDeletePrefPreset::onBtnCancel() diff --git a/indra/newview/llfloatersaveprefpreset.cpp b/indra/newview/llfloatersaveprefpreset.cpp index 3148978778..31598a8d12 100644 --- a/indra/newview/llfloatersaveprefpreset.cpp +++ b/indra/newview/llfloatersaveprefpreset.cpp @@ -82,7 +82,11 @@ void LLFloaterSavePrefPreset::onBtnSave() LLPresetsManager::getInstance()->savePreset(mSubdirectory, name); + std::string preset = mSubdirectory; + preset[0] = std::toupper(preset[0]); + LLSD args; + args["TYPE"] = preset; args["NAME"] = name; LLNotificationsUtil::add("PresetSaved", args); } diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 1618ea0ec7..83370dbba0 100755 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -7661,14 +7661,14 @@ Attachment has been saved. icon="notifytip.tga" name="PresetSaved" type="notifytip"> -Preset [NAME] has been saved. +[TYPE] preset [NAME] has been saved. </notification> <notification icon="notifytip.tga" name="PresetDeleted" type="notifytip"> -Preset [NAME] has been deleted. +[TYPE] preset [NAME] has been deleted. </notification> <notification diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index a763e3ee2f..1c655c6559 100755 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -4043,6 +4043,6 @@ Try enclosing path to the editor with double quotes. </string> <!-- Presets graphic/camera --> - <string name="preset_combo_label">-None saved yet-</string> + <string name="preset_combo_label">-Empty list-</string> </strings> |