summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRider Linden <rider@lindenlab.com>2019-02-14 16:20:44 -0800
committerRider Linden <rider@lindenlab.com>2019-02-14 16:20:44 -0800
commit43d754b5dee76a47b5b500c6786a7447b61e4bc8 (patch)
treeaa0a3b78866c47181adc436614a0c41789861e5c
parent2108d5ee38a955f140f40aa71705aa04e4487362 (diff)
parent4b238a49750cd02739c679282e2564b54706ad00 (diff)
Merge
-rw-r--r--indra/newview/llfloatereditextdaycycle.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llfloatereditextdaycycle.cpp b/indra/newview/llfloatereditextdaycycle.cpp
index c16eb11293..eccdf8249d 100644
--- a/indra/newview/llfloatereditextdaycycle.cpp
+++ b/indra/newview/llfloatereditextdaycycle.cpp
@@ -414,6 +414,8 @@ void LLFloaterEditExtDayCycle::onOpen(const LLSD& key)
}
else if ((mEditContext == CONTEXT_REGION) || (mEditContext == CONTEXT_PARCEL))
{
+ std::string commit_str = (mEditContext == CONTEXT_PARCEL) ? STR_COMMIT_PARCEL : STR_COMMIT_REGION;
+ mFlyoutControl->setMenuItemLabel(ACTION_COMMIT, getString(commit_str));
mFlyoutControl->setShownBtnEnabled(true);
mFlyoutControl->setSelectedItem(ACTION_COMMIT);
}