diff options
| -rw-r--r-- | indra/newview/llpanelpick.cpp | 12 | ||||
| -rw-r--r-- | indra/newview/llpanelpick.h | 2 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_edit_pick.xml | 4 |
3 files changed, 14 insertions, 4 deletions
diff --git a/indra/newview/llpanelpick.cpp b/indra/newview/llpanelpick.cpp index 5ac0587550..82bbcaf38b 100644 --- a/indra/newview/llpanelpick.cpp +++ b/indra/newview/llpanelpick.cpp @@ -76,8 +76,6 @@ #define LABEL_PICK = "Pick" #define LABEL_CHANGES = "Changes" -std::string SET_LOCATION_NOTICE("(will update after save)"); - ////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////// @@ -410,7 +408,7 @@ void LLPanelPickEdit::onOpen(const LLSD& key) childSetValue("pick_name", pick_name.empty() ? region_name : pick_name); childSetValue("pick_desc", pick_desc); setSnapshotId(snapshot_id); - setPickLocation(createLocationText(SET_LOCATION_NOTICE, pick_name, region_name, getPosGlobal())); + setPickLocation(createLocationText(getLocationNotice(), pick_name, region_name, getPosGlobal())); enableSaveButton(true); } @@ -578,7 +576,7 @@ void LLPanelPickEdit::onClickSetLocation() region_name = region->getName(); } - setPickLocation(createLocationText(SET_LOCATION_NOTICE, parcel_name, region_name, getPosGlobal())); + setPickLocation(createLocationText(getLocationNotice(), parcel_name, region_name, getPosGlobal())); mLocationChanged = true; enableSaveButton(TRUE); @@ -595,6 +593,12 @@ void LLPanelPickEdit::onClickSave() notifyParent(params); } +std::string LLPanelPickEdit::getLocationNotice() +{ + static std::string notice = getString("location_notice"); + return notice; +} + void LLPanelPickEdit::processProperties(void* data, EAvatarProcessorType type) { if(mNeedData) diff --git a/indra/newview/llpanelpick.h b/indra/newview/llpanelpick.h index 4f27760a8d..94ee2f83ab 100644 --- a/indra/newview/llpanelpick.h +++ b/indra/newview/llpanelpick.h @@ -248,6 +248,8 @@ protected: */ void onClickSave(); + std::string getLocationNotice(); + protected: bool mLocationChanged; diff --git a/indra/newview/skins/default/xui/en/panel_edit_pick.xml b/indra/newview/skins/default/xui/en/panel_edit_pick.xml index 7445bb339d..15517fb805 100644 --- a/indra/newview/skins/default/xui/en/panel_edit_pick.xml +++ b/indra/newview/skins/default/xui/en/panel_edit_pick.xml @@ -12,6 +12,10 @@ help_topic="profile_edit_pick" top="0" width="333"> + <panel.string + name="location_notice"> + (will update after save) + </panel.string> <button follows="top|right" height="23" |