diff options
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llpanelenvironment.cpp | 8 | ||||
| -rw-r--r-- | indra/newview/llpanelenvironment.h | 4 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/menu_viewer.xml | 4 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_region_environment.xml | 6 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/strings.xml | 6 |
5 files changed, 13 insertions, 15 deletions
diff --git a/indra/newview/llpanelenvironment.cpp b/indra/newview/llpanelenvironment.cpp index 41d7d8b54f..258b6714b1 100644 --- a/indra/newview/llpanelenvironment.cpp +++ b/indra/newview/llpanelenvironment.cpp @@ -270,7 +270,7 @@ LLFloaterSettingsPicker * LLPanelEnvironmentInfo::getSettingsPicker(bool create) mSettingsFloater = picker->getHandle(); - picker->setCommitCallback([this](LLUICtrl *, const LLSD &data){ onPickerCommited(data.asUUID()); }); + picker->setCommitCallback([this](LLUICtrl *, const LLSD &data){ onPickerCommitted(data.asUUID()); }); } return picker; @@ -295,7 +295,7 @@ LLFloaterEditExtDayCycle * LLPanelEnvironmentInfo::getEditFloater(bool create) } if (editor && !mCommitConnection.connected()) - mCommitConnection = editor->setEditCommitSignal([this](LLSettingsDay::ptr_t pday) { onEditCommited(pday); }); + mCommitConnection = editor->setEditCommitSignal([this](LLSettingsDay::ptr_t pday) { onEditCommitted(pday); }); return editor; } @@ -615,7 +615,7 @@ void LLPanelEnvironmentInfo::onIdlePlay(void *data) ((LLPanelEnvironmentInfo *)data)->udpateApparentTimeOfDay(); } -void LLPanelEnvironmentInfo::onPickerCommited(LLUUID asset_id) +void LLPanelEnvironmentInfo::onPickerCommitted(LLUUID asset_id) { LLSettingsVOBase::getSettingsAsset(asset_id, [this](LLUUID, LLSettingsBase::ptr_t settings, S32 status, LLExtStat) { if (status) @@ -624,7 +624,7 @@ void LLPanelEnvironmentInfo::onPickerCommited(LLUUID asset_id) }); } -void LLPanelEnvironmentInfo::onEditCommited(LLSettingsDay::ptr_t newday) +void LLPanelEnvironmentInfo::onEditCommitted(LLSettingsDay::ptr_t newday) { if (!newday) { diff --git a/indra/newview/llpanelenvironment.h b/indra/newview/llpanelenvironment.h index bd3db34332..c18092e2e5 100644 --- a/indra/newview/llpanelenvironment.h +++ b/indra/newview/llpanelenvironment.h @@ -116,8 +116,8 @@ protected: void udpateApparentTimeOfDay(); - void onPickerCommited(LLUUID asset_id); - void onEditCommited(LLSettingsDay::ptr_t newday); + void onPickerCommitted(LLUUID asset_id); + void onEditCommitted(LLSettingsDay::ptr_t newday); void onPickerAssetDownloaded(LLSettingsBase::ptr_t settings); void onEnvironmentReceived(S32 parcel_id, LLEnvironment::EnvironmentInfo::ptr_t envifo); diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml index b6bc271cf1..8af754ffec 100644 --- a/indra/newview/skins/default/xui/en/menu_viewer.xml +++ b/indra/newview/skins/default/xui/en/menu_viewer.xml @@ -698,8 +698,8 @@ parameter="midnight" /> </menu_item_check> <menu_item_check - label="Use Region Settings" - name="Use Region Settings"> + label="Use Shared Environment" + name="Use Shared Environment"> <menu_item_check.on_click function="World.EnvSettings" parameter="region" /> diff --git a/indra/newview/skins/default/xui/en/panel_region_environment.xml b/indra/newview/skins/default/xui/en/panel_region_environment.xml index 8229dcb91d..a58f38d417 100644 --- a/indra/newview/skins/default/xui/en/panel_region_environment.xml +++ b/indra/newview/skins/default/xui/en/panel_region_environment.xml @@ -26,13 +26,11 @@ name="pnl_environment_disabled" visible="false"> <text follows="top|left|bottom|right" - font="SansSerif" halign="center" valign="top" - top_pad="20" + top_pad="40" text_color="white"> -No Parcel parcel is selected. Environmental -settings are disabled. +No parcel is selected. Environmental settings are disabled. </text> </layout_panel> <layout_panel diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 3a882a73d3..76d040150d 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -404,9 +404,9 @@ http://secondlife.com/support for help fixing this problem. <string name="simstate">simstate</string> <string name="favorite">favorite</string> <string name="symbolic link">link</string> - <string name="symbolic folder link">folder link</string> - <string name="mesh">mesh</string> - <string name="settings">settings</string> + <string name="settings blob">settings</string> + <string name="symbolic folder link">folder link</string> + <string name="mesh">mesh</string> <!-- llvoavatar. Displayed in the avatar chat bubble --> <string name="AvatarEditingAppearance">(Editing Appearance)</string> |