From bb4903d28ca42faf68979a64ecd584372d8ca143 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Mon, 25 Aug 2014 14:02:44 +0200 Subject: [PATCH] FIRE-2717: Display traffic and area in landmark --- indra/newview/llpanelplaceinfo.cpp | 29 ++++++++++++++++- indra/newview/llpanelplaceinfo.h | 2 ++ .../ansastorm/xui/en/panel_landmark_info.xml | 32 ++++++++++++++++--- .../default/xui/de/panel_landmark_info.xml | 4 +++ .../default/xui/en/panel_landmark_info.xml | 32 ++++++++++++++++--- .../firestorm/xui/en/panel_landmark_info.xml | 32 ++++++++++++++++--- .../starlight/xui/en/panel_landmark_info.xml | 32 +++++++++++++++---- .../xui/en/panel_landmark_info.xml | 32 +++++++++++++++---- .../vintage/xui/en/panel_landmark_info.xml | 32 ++++++++++++++++--- 9 files changed, 194 insertions(+), 33 deletions(-) diff --git a/indra/newview/llpanelplaceinfo.cpp b/indra/newview/llpanelplaceinfo.cpp index e4687cd46f..66edfa281f 100755 --- a/indra/newview/llpanelplaceinfo.cpp +++ b/indra/newview/llpanelplaceinfo.cpp @@ -56,7 +56,9 @@ LLPanelPlaceInfo::LLPanelPlaceInfo() mInfoType(UNKNOWN), mScrollingPanel(NULL), mScrollContainer(NULL), - mDescEditor(NULL) + mDescEditor(NULL), + // FIRE-2717: Display traffic and area in landmark + mInfoText(NULL) {} //virtual @@ -78,6 +80,8 @@ BOOL LLPanelPlaceInfo::postBuild() mRegionName = getChild("region_title"); mParcelName = getChild("parcel_title"); mDescEditor = getChild("description"); + // FIRE-2717: Display traffic and area in landmark + mInfoText = findChild("information"); mMaturityRatingIcon = getChild("maturity_icon"); mMaturityRatingText = getChild("maturity_value"); @@ -103,6 +107,12 @@ void LLPanelPlaceInfo::resetLocation() mRegionName->setText(loading); mParcelName->setText(loading); mDescEditor->setText(loading); + // FIRE-2717: Display traffic and area in landmark + if (mInfoText) + { + mInfoText->setText(loading); + } + // // Fix loading icon //mMaturityRatingIcon->setValue(LLUUID::null); mMaturityRatingIcon->setValue(LLSD("Unknown_Icon")); @@ -195,6 +205,12 @@ void LLPanelPlaceInfo::setErrorStatus(U32 status, const std::string& reason) mMaturityRatingText->setValue(not_available); mRegionName->setText(not_available); mParcelName->setText(not_available); + // FIRE-2717: Display traffic and area in landmark + if (mInfoText) + { + mInfoText->setText(not_available); + } + // // Fix loading icon //mMaturityRatingIcon->setValue(LLUUID::null); mMaturityRatingIcon->setValue(LLSD("Unknown_Icon")); @@ -260,6 +276,17 @@ void LLPanelPlaceInfo::processParcelInfo(const LLParcelData& parcel_data) mParcelName->setText(getString("not_available")); } + // FIRE-2717: Display traffic and area in landmark + if (mInfoText) + { + LLStringUtil::format_map_t args; + args["TRAFFIC"] = llformat("%d", (S32)parcel_data.dwell); + args["AREA"] = llformat("%d", parcel_data.actual_area); + std::string info_text = getString("information_text", args); + mInfoText->setText(info_text); + } + // + // FIRE-817: Separate place details floater if (!mParcelDetailLoadedSignal.empty()) { diff --git a/indra/newview/llpanelplaceinfo.h b/indra/newview/llpanelplaceinfo.h index 6c93033df5..b832014ef4 100755 --- a/indra/newview/llpanelplaceinfo.h +++ b/indra/newview/llpanelplaceinfo.h @@ -136,6 +136,8 @@ protected: LLExpandableTextBox* mDescEditor; LLIconCtrl* mMaturityRatingIcon; LLTextBox* mMaturityRatingText; + // FIRE-2717: Display traffic and area in landmark + LLTextBox* mInfoText; }; #endif // LL_LLPANELPLACEINFO_H diff --git a/indra/newview/skins/ansastorm/xui/en/panel_landmark_info.xml b/indra/newview/skins/ansastorm/xui/en/panel_landmark_info.xml index c71780d3f5..fa7158c2de 100644 --- a/indra/newview/skins/ansastorm/xui/en/panel_landmark_info.xml +++ b/indra/newview/skins/ansastorm/xui/en/panel_landmark_info.xml @@ -2,10 +2,10 @@ @@ -43,6 +43,10 @@ name="acquired_date"> [wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local] + + Traffic: [TRAFFIC] Area: [AREA] m² + @@ -191,7 +195,7 @@ + + + + [wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local] + + Traffic: [TRAFFIC] Gebiet: [AREA] m² + @@ -38,6 +41,7 @@ + diff --git a/indra/newview/skins/default/xui/en/panel_landmark_info.xml b/indra/newview/skins/default/xui/en/panel_landmark_info.xml index 1136397d56..d0ec14aa9c 100755 --- a/indra/newview/skins/default/xui/en/panel_landmark_info.xml +++ b/indra/newview/skins/default/xui/en/panel_landmark_info.xml @@ -1,10 +1,10 @@ @@ -42,6 +42,10 @@ name="acquired_date"> [wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local] + + Traffic: [TRAFFIC] Area: [AREA] m² + @@ -190,7 +194,7 @@ + + + + @@ -43,6 +43,10 @@ name="acquired_date"> [wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local] + + Traffic: [TRAFFIC] Area: [AREA] m² + @@ -191,7 +195,7 @@ + + + + [wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local] + + Traffic: [TRAFFIC] Area: [AREA] m² + @@ -115,7 +119,7 @@ + + [wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local] + + Traffic: [TRAFFIC] Area: [AREA] m² + @@ -115,7 +119,7 @@ + + @@ -43,6 +43,10 @@ name="acquired_date"> [wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local] + + Traffic: [TRAFFIC] Area: [AREA] m² + @@ -191,7 +195,7 @@ + + + +