livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SL-1402, SL-1193, SL-976: Corrected strings and layout for named bugs 

("Use Shared Environment", no selection format in panel, Missing String in give object)
Also Rider learned how to spell Committed
meow-7.2.2
Rider Linden 2018-09-12 17:05:27 -07:00
parent d4927e8f07
commit 27a76a7e73
5 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
indra/newview/llpanelenvironment.cpp
View File

@ -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)
{

4
indra/newview/llpanelenvironment.h
View File

@ -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);

4
indra/newview/skins/default/xui/en/menu_viewer.xml
View File

@ -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" />

6
indra/newview/skins/default/xui/en/panel_region_environment.xml
View File

@ -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

6
indra/newview/skins/default/xui/en/strings.xml
View File

@ -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>