From 39e980f2b93c66f1ae478d2048e543f741a9df5c Mon Sep 17 00:00:00 2001 From: Ansariel Date: Thu, 10 Apr 2014 14:59:40 +0200 Subject: [PATCH] FIRE-9211: Add counter to parcel ban and access lists --- indra/newview/llfloaterland.cpp | 14 ++++++++++++++ .../skins/default/xui/de/floater_about_land.xml | 4 ++-- .../skins/default/xui/en/floater_about_land.xml | 4 ++-- .../skins/default/xui/es/floater_about_land.xml | 4 ++-- .../skins/default/xui/fr/floater_about_land.xml | 4 ++-- .../skins/default/xui/it/floater_about_land.xml | 4 ++-- .../skins/default/xui/ja/floater_about_land.xml | 4 ++-- .../skins/default/xui/pl/floater_about_land.xml | 4 ++-- .../skins/default/xui/pt/floater_about_land.xml | 4 ++-- .../skins/default/xui/ru/floater_about_land.xml | 4 ++-- .../skins/default/xui/tr/floater_about_land.xml | 4 ++-- .../skins/default/xui/zh/floater_about_land.xml | 4 ++-- .../skins/latency/xui/de/floater_about_land.xml | 4 ++-- .../skins/latency/xui/en/floater_about_land.xml | 4 ++-- .../skins/latency/xui/pl/floater_about_land.xml | 4 ++-- .../skins/vintage/xui/de/floater_about_land.xml | 4 ++-- .../skins/vintage/xui/en/floater_about_land.xml | 4 ++-- .../skins/vintage/xui/es/floater_about_land.xml | 4 ++-- .../skins/vintage/xui/fr/floater_about_land.xml | 4 ++-- .../skins/vintage/xui/it/floater_about_land.xml | 4 ++-- .../skins/vintage/xui/pl/floater_about_land.xml | 4 ++-- .../skins/vintage/xui/pt/floater_about_land.xml | 4 ++-- .../skins/vintage/xui/ru/floater_about_land.xml | 4 ++-- .../skins/vintage/xui/tr/floater_about_land.xml | 4 ++-- 24 files changed, 60 insertions(+), 46 deletions(-) diff --git a/indra/newview/llfloaterland.cpp b/indra/newview/llfloaterland.cpp index c7360b6ae7..240309ec1e 100755 --- a/indra/newview/llfloaterland.cpp +++ b/indra/newview/llfloaterland.cpp @@ -2591,6 +2591,10 @@ void LLPanelLandAccess::refresh() S32 count = parcel->mAccessList.size(); getChild("AccessList")->setToolTipArg(LLStringExplicit("[LISTED]"), llformat("%d",count)); getChild("AccessList")->setToolTipArg(LLStringExplicit("[MAX]"), llformat("%d",PARCEL_MAX_ACCESS_LIST)); + // FIRE-9211: Add counter to parcel ban and access lists + getChild("AllowedText")->setTextArg(LLStringExplicit("[LISTED]"), llformat("%d",count)); + getChild("AllowedText")->setTextArg(LLStringExplicit("[MAX]"), llformat("%d",PARCEL_MAX_ACCESS_LIST)); + // for (access_map_const_iterator cit = parcel->mAccessList.begin(); cit != parcel->mAccessList.end(); ++cit) @@ -2637,6 +2641,10 @@ void LLPanelLandAccess::refresh() getChild("BannedList")->setToolTipArg(LLStringExplicit("[LISTED]"), llformat("%d",count)); getChild("BannedList")->setToolTipArg(LLStringExplicit("[MAX]"), llformat("%d",PARCEL_MAX_ACCESS_LIST)); + // FIRE-9211: Add counter to parcel ban and access lists + getChild("BanCheck")->setTextArg(LLStringExplicit("[LISTED]"), llformat("%d",count)); + getChild("BanCheck")->setTextArg(LLStringExplicit("[MAX]"), llformat("%d",PARCEL_MAX_ACCESS_LIST)); + // for (access_map_const_iterator cit = parcel->mBanList.begin(); cit != parcel->mBanList.end(); ++cit) @@ -2725,6 +2733,12 @@ void LLPanelLandAccess::refresh() getChild("AccessList")->setToolTipArg(LLStringExplicit("[MAX]"), llformat("%d",0)); getChild("BannedList")->setToolTipArg(LLStringExplicit("[LISTED]"), llformat("%d",0)); getChild("BannedList")->setToolTipArg(LLStringExplicit("[MAX]"), llformat("%d",0)); + // FIRE-9211: Add counter to parcel ban and access lists + getChild("AllowedText")->setTextArg(LLStringExplicit("[LISTED]"), llformat("%d",0)); + getChild("AllowedText")->setTextArg(LLStringExplicit("[MAX]"), llformat("%d",0)); + getChild("BanCheck")->setTextArg(LLStringExplicit("[LISTED]"), llformat("%d",0)); + getChild("BanCheck")->setTextArg(LLStringExplicit("[MAX]"), llformat("%d",0)); + // } } diff --git a/indra/newview/skins/default/xui/de/floater_about_land.xml b/indra/newview/skins/default/xui/de/floater_about_land.xml index edd5358a67..0923b14fa3 100755 --- a/indra/newview/skins/default/xui/de/floater_about_land.xml +++ b/indra/newview/skins/default/xui/de/floater_about_land.xml @@ -484,7 +484,7 @@ Nur große Parzellen können in der Suche aufgeführt werden. - Zulässige Einwohner + Zulässige Einwohner ([LISTED]/[MAX])