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

FIRE-9211: Add counter to parcel ban and access lists

Ansariel 2014-04-10 14:59:40 +02:00
parent a6e424db72
commit 39e980f2b9
24 changed files with 60 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
indra/newview/llfloaterland.cpp
View File

@ -2591,6 +2591,10 @@ void LLPanelLandAccess::refresh()
S32 count = parcel->mAccessList.size();
getChild<LLUICtrl>("AccessList")->setToolTipArg(LLStringExplicit("[LISTED]"), llformat("%d",count));
getChild<LLUICtrl>("AccessList")->setToolTipArg(LLStringExplicit("[MAX]"), llformat("%d",PARCEL_MAX_ACCESS_LIST));
// <FS:Ansariel> FIRE-9211: Add counter to parcel ban and access lists
getChild<LLUICtrl>("AllowedText")->setTextArg(LLStringExplicit("[LISTED]"), llformat("%d",count));
getChild<LLUICtrl>("AllowedText")->setTextArg(LLStringExplicit("[MAX]"), llformat("%d",PARCEL_MAX_ACCESS_LIST));
// </FS:Ansariel>
for (access_map_const_iterator cit = parcel->mAccessList.begin();
cit != parcel->mAccessList.end(); ++cit)
@ -2637,6 +2641,10 @@ void LLPanelLandAccess::refresh()
getChild<LLUICtrl>("BannedList")->setToolTipArg(LLStringExplicit("[LISTED]"), llformat("%d",count));
getChild<LLUICtrl>("BannedList")->setToolTipArg(LLStringExplicit("[MAX]"), llformat("%d",PARCEL_MAX_ACCESS_LIST));
// <FS:Ansariel> FIRE-9211: Add counter to parcel ban and access lists
getChild<LLUICtrl>("BanCheck")->setTextArg(LLStringExplicit("[LISTED]"), llformat("%d",count));
getChild<LLUICtrl>("BanCheck")->setTextArg(LLStringExplicit("[MAX]"), llformat("%d",PARCEL_MAX_ACCESS_LIST));
// </FS:Ansariel>
for (access_map_const_iterator cit = parcel->mBanList.begin();
cit != parcel->mBanList.end(); ++cit)
@ -2725,6 +2733,12 @@ void LLPanelLandAccess::refresh()
getChild<LLUICtrl>("AccessList")->setToolTipArg(LLStringExplicit("[MAX]"), llformat("%d",0));
getChild<LLUICtrl>("BannedList")->setToolTipArg(LLStringExplicit("[LISTED]"), llformat("%d",0));
getChild<LLUICtrl>("BannedList")->setToolTipArg(LLStringExplicit("[MAX]"), llformat("%d",0));
// <FS:Ansariel> FIRE-9211: Add counter to parcel ban and access lists
getChild<LLUICtrl>("AllowedText")->setTextArg(LLStringExplicit("[LISTED]"), llformat("%d",0));
getChild<LLUICtrl>("AllowedText")->setTextArg(LLStringExplicit("[MAX]"), llformat("%d",0));
getChild<LLUICtrl>("BanCheck")->setTextArg(LLStringExplicit("[LISTED]"), llformat("%d",0));
getChild<LLUICtrl>("BanCheck")->setTextArg(LLStringExplicit("[MAX]"), llformat("%d",0));
// </FS:Ansariel>
}
}

4
indra/newview/skins/default/xui/de/floater_about_land.xml
View File

@ -484,7 +484,7 @@ Nur große Parzellen können in der Suche aufgeführt werden.
<spinner label="Online-Zeit:" name="HoursSpin"/>
<panel name="Allowed_layout_panel">
<text label="Immer erlauben" name="AllowedText">
Zulässige Einwohner
Zulässige Einwohner ([LISTED]/[MAX])
</text>
<name_list name="AccessList" tool_tip="([LISTED] aufgeführt, [MAX] max)"/>
<button label="Hinzufügen" name="add_allowed"/>
@ -492,7 +492,7 @@ Nur große Parzellen können in der Suche aufgeführt werden.
</panel>
<panel name="Banned_layout_panel">
<text label="Verbannen" name="BanCheck">
Verbannte Einwohner
Verbannte Einwohner ([LISTED]/[MAX])
</text>
<name_list name="BannedList" tool_tip="([LISTED] aufgeführt, [MAX] max)"/>
<button label="Hinzufügen" name="add_banned"/>

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

@ -2124,7 +2124,7 @@ Only large parcels can be listed in search.
name="AllowedText"
top="0"
width="230">
Allowed Residents
Allowed Residents ([LISTED]/[MAX])
</text>
<name_list
column_padding="0"
@ -2173,7 +2173,7 @@ Only large parcels can be listed in search.
name="BanCheck"
top="0"
width="200">
Banned Residents
Banned Residents ([LISTED]/[MAX])
</text>
<name_list
column_padding="0"

4
indra/newview/skins/default/xui/es/floater_about_land.xml
View File

@ -480,7 +480,7 @@ los medios:
<spinner label="Horas de acceso:" name="HoursSpin"/>
<panel name="Allowed_layout_panel">
<text label="Always Allow" name="AllowedText">
Residentes autorizados
Residentes autorizados ([LISTED]/[MAX])
</text>
<name_list name="AccessList" tool_tip="([LISTED] listados de un máx. de [MAX])"/>
<button label="Añadir" name="add_allowed"/>
@ -488,7 +488,7 @@ los medios:
</panel>
<panel name="Banned_layout_panel">
<text label="Ban" name="BanCheck">
Residentes con el acceso prohibido
Residentes con el acceso prohibido ([LISTED]/[MAX])
</text>
<name_list name="BannedList" tool_tip="([LISTED] listados de un máx. de [MAX])"/>
<button label="Añadir" name="add_banned"/>

4
indra/newview/skins/default/xui/fr/floater_about_land.xml
View File

@ -484,7 +484,7 @@ musique :
<spinner label="Durée en heures :" name="HoursSpin"/>
<panel name="Allowed_layout_panel">
<text label="Toujours autoriser" name="AllowedText">
Résidents autorisés
Résidents autorisés ([LISTED]/[MAX])
</text>
<name_list name="AccessList" tool_tip="([LISTED] dans la liste, [MAX] max.)"/>
<button label="Ajouter" name="add_allowed"/>
@ -492,7 +492,7 @@ musique :
</panel>
<panel name="Banned_layout_panel">
<text label="Bannir" name="BanCheck">
Résidents bannis
Résidents bannis ([LISTED]/[MAX])
</text>
<name_list name="BannedList" tool_tip="([LISTED] dans la liste, [MAX] max.)"/>
<button label="Ajouter" name="add_banned"/>

4
indra/newview/skins/default/xui/it/floater_about_land.xml
View File

@ -485,7 +485,7 @@ Media:
<spinner label="Ore di accesso:" name="HoursSpin"/>
<panel name="Allowed_layout_panel">
<text label="Consenti sempre" name="AllowedText">
Residenti consentiti
Residenti consentiti ([LISTED]/[MAX])
</text>
<name_list name="AccessList" tool_tip="([LISTED] in lista, [MAX] max)"/>
<button label="Aggiungi" name="add_allowed"/>
@ -493,7 +493,7 @@ Media:
</panel>
<panel name="Banned_layout_panel">
<text label="Espelli" name="BanCheck">
Residenti con divieto
Residenti con divieto ([LISTED]/[MAX])
</text>
<name_list name="BannedList" tool_tip="([LISTED] in lista, [MAX] max)"/>
<button label="Aggiungi" name="add_banned"/>

4
indra/newview/skins/default/xui/ja/floater_about_land.xml
View File

@ -494,7 +494,7 @@
<spinner label="アクセス時間：" name="HoursSpin"/>
<panel name="Allowed_layout_panel">
<text label="常に許可" name="AllowedText">
立入を許可された住人
立入を許可された住人 ([LISTED]/[MAX])
</text>
<name_list name="AccessList" tool_tip="(合計[LISTED] 人、最大 [MAX] 人）"/>
<button label="追加" name="add_allowed"/>
@ -502,7 +502,7 @@
</panel>
<panel name="Banned_layout_panel">
<text label="禁止" name="BanCheck">
立入を禁止された住人
立入を禁止された住人 ([LISTED]/[MAX])
</text>
<name_list name="BannedList" tool_tip="(合計 [LISTED] 人、最大 [MAX] 人）"/>
<button label="追加" name="add_banned"/>

4
indra/newview/skins/default/xui/pl/floater_about_land.xml
View File

@ -457,7 +457,7 @@ teksturę:
<spinner label="Godziny dostępu:" name="HoursSpin"/>
<panel name="Allowed_layout_panel">
<text label="Zawsze Zezwalaj" name="AllowedText">
Dozwoleni Rezydenci
Dozwoleni Rezydenci ([LISTED]/[MAX])
</text>
<name_list name="AccessList" tool_tip="([LISTED] na liście, [MAX] maksimum)"/>
<button label="Dodaj" name="add_allowed"/>
@ -465,7 +465,7 @@ teksturę:
</panel>
<panel name="Banned_layout_panel">
<text label="Banuj" name="BanCheck">
Zbanowani Rezydenci
Zbanowani Rezydenci ([LISTED]/[MAX])
</text>
<name_list name="BannedList" tool_tip="([LISTED] na liście, [MAX] maksimum)"/>
<button label="Dodaj" name="add_banned"/>

4
indra/newview/skins/default/xui/pt/floater_about_land.xml
View File

@ -479,7 +479,7 @@ Mídia:
<spinner label="Horas de acesso:" name="HoursSpin"/>
<panel name="Allowed_layout_panel">
<text label="Always Allow" name="AllowedText">
Residentes permitidos
Residentes permitidos ([LISTED]/[MAX])
</text>
<name_list name="AccessList" tool_tip="(Total [LISTED], máx de [MAX])"/>
<button label="Adicionar" name="add_allowed"/>
@ -487,7 +487,7 @@ Mídia:
</panel>
<panel name="Banned_layout_panel">
<text label="Ban" name="BanCheck">
Residentes banidos
Residentes banidos ([LISTED]/[MAX])
</text>
<name_list name="BannedList" tool_tip="(Total [LISTED], máx de [MAX])"/>
<button label="Adicionar" name="add_banned"/>

4
indra/newview/skins/default/xui/ru/floater_about_land.xml
View File

@ -462,7 +462,7 @@
<spinner label="Часы доступа:" name="HoursSpin"/>
<panel name="Allowed_layout_panel">
<text label="Всегда разрешено" name="AllowedText">
Допущенные жители
Допущенные жители ([LISTED]/[MAX])
</text>
<name_list name="AccessList" tool_tip="([LISTED] в списке, [MAX] максимум)"/>
<button label="Добавить" name="add_allowed"/>
@ -470,7 +470,7 @@
</panel>
<panel name="Banned_layout_panel">
<text label="Бан" name="BanCheck">
Забаненные жители
Забаненные жители ([LISTED]/[MAX])
</text>
<name_list name="BannedList" tool_tip="([LISTED] в списке, [MAX] максимум)"/>
<button label="Добавить" name="add_banned"/>

4
indra/newview/skins/default/xui/tr/floater_about_land.xml
View File

@ -462,7 +462,7 @@ Sadece büyük parseller aramada görünür.
<spinner label="Erişim saatleri:" name="HoursSpin"/>
<panel name="Allowed_layout_panel">
<text label="Her Zaman İzin Ver" name="AllowedText">
İzin Verilen Sakinler
İzin Verilen Sakinler ([LISTED]/[MAX])
</text>
<name_list name="AccessList" tool_tip="([LISTED] listeli, [MAX] maksimum)"/>
<button label="Ekle" name="add_allowed"/>
@ -470,7 +470,7 @@ Sadece büyük parseller aramada görünür.
</panel>
<panel name="Banned_layout_panel">
<text label="Yasakla" name="BanCheck">
Yasaklı Sakinler
Yasaklı Sakinler ([LISTED]/[MAX])
</text>
<name_list name="BannedList" tool_tip="([LISTED] listeli, [MAX] maksimum)"/>
<button label="Ekle" name="add_banned"/>

4
indra/newview/skins/default/xui/zh/floater_about_land.xml
View File

@ -462,7 +462,7 @@
<spinner label="出入時間：" name="HoursSpin"/>
<panel name="Allowed_layout_panel">
<text label="永遠允許" name="AllowedText">
允許的居民
允許的居民 ([LISTED]/[MAX])
</text>
<name_list name="AccessList" tool_tip="（已列入 [LISTED]，最多可列 [MAX]）"/>
<button label="添加" name="add_allowed"/>
@ -470,7 +470,7 @@
</panel>
<panel name="Banned_layout_panel">
<text label="禁止" name="BanCheck">
被封鎖的居民
被封鎖的居民 ([LISTED]/[MAX])
</text>
<name_list name="BannedList" tool_tip="（已列入 [LISTED]，最多可列 [MAX]）"/>
<button label="添加" name="add_banned"/>

4
indra/newview/skins/latency/xui/de/floater_about_land.xml
View File

@ -481,7 +481,7 @@ Nur große Parzellen können in der Suche aufgeführt werden.
<spinner label="Online-Zeit:" name="HoursSpin"/>
<panel name="Allowed_layout_panel">
<text label="Immer erlauben" name="AllowedText">
Zulässige Einwohner
Zulässige Einwohner ([LISTED]/[MAX])
</text>
<name_list name="AccessList" tool_tip="([LISTED] aufgeführt, [MAX] max)"/>
<button label="Hinzufügen" name="add_allowed"/>
@ -489,7 +489,7 @@ Nur große Parzellen können in der Suche aufgeführt werden.
</panel>
<panel name="Banned_layout_panel">
<text label="Verbannen" name="BanCheck">
Verbannte Einwohner
Verbannte Einwohner ([LISTED]/[MAX])
</text>
<name_list name="BannedList" tool_tip="([LISTED] aufgeführt, [MAX] max)"/>
<button label="Hinzufügen" name="add_banned"/>

4
indra/newview/skins/latency/xui/en/floater_about_land.xml
View File

@ -2072,7 +2072,7 @@ Only large parcels can be listed in search.
name="AllowedText"
top="0"
width="230">
Allowed Residents
Allowed Residents ([LISTED]/[MAX])
</text>
<name_list
column_padding="0"
@ -2121,7 +2121,7 @@ Only large parcels can be listed in search.
name="BanCheck"
top="0"
width="200">
Banned Residents
Banned Residents ([LISTED]/[MAX])
</text>
<name_list
column_padding="0"

4
indra/newview/skins/latency/xui/pl/floater_about_land.xml
View File

@ -457,7 +457,7 @@ teksturę:
<spinner label="Godziny dostępu:" name="HoursSpin"/>
<panel name="Allowed_layout_panel">
<text label="Zawsze Zezwalaj" name="AllowedText">
Dozwoleni Rezydenci
Dozwoleni Rezydenci ([LISTED]/[MAX])
</text>
<name_list name="AccessList" tool_tip="([LISTED] na liście, [MAX] maksimum)"/>
<button label="Dodaj" name="add_allowed"/>
@ -465,7 +465,7 @@ teksturę:
</panel>
<panel name="Banned_layout_panel">
<text label="Banuj" name="BanCheck">
Zbanowani Rezydenci
Zbanowani Rezydenci ([LISTED]/[MAX])
</text>
<name_list name="BannedList" tool_tip="([LISTED] na liście, [MAX] maksimum)"/>
<button label="Dodaj" name="add_banned"/>

4
indra/newview/skins/vintage/xui/de/floater_about_land.xml
View File

@ -481,7 +481,7 @@ Nur große Parzellen können in der Suche aufgeführt werden.
<spinner label="Online-Zeit:" name="HoursSpin"/>
<panel name="Allowed_layout_panel">
<text label="Immer erlauben" name="AllowedText">
Zulässige Einwohner
Zulässige Einwohner ([LISTED]/[MAX])
</text>
<name_list name="AccessList" tool_tip="([LISTED] aufgeführt, [MAX] max)"/>
<button label="Hinzufügen" name="add_allowed"/>
@ -489,7 +489,7 @@ Nur große Parzellen können in der Suche aufgeführt werden.
</panel>
<panel name="Banned_layout_panel">
<text label="Verbannen" name="BanCheck">
Verbannte Einwohner
Verbannte Einwohner ([LISTED]/[MAX])
</text>
<name_list name="BannedList" tool_tip="([LISTED] aufgeführt, [MAX] max)"/>
<button label="Hinzufügen" name="add_banned"/>

4
indra/newview/skins/vintage/xui/en/floater_about_land.xml
View File

@ -2072,7 +2072,7 @@ Only large parcels can be listed in search.
name="AllowedText"
top="0"
width="230">
Allowed Residents
Allowed Residents ([LISTED]/[MAX])
</text>
<name_list
column_padding="0"
@ -2121,7 +2121,7 @@ Only large parcels can be listed in search.
name="BanCheck"
top="0"
width="200">
Banned Residents
Banned Residents ([LISTED]/[MAX])
</text>
<name_list
column_padding="0"

4
indra/newview/skins/vintage/xui/es/floater_about_land.xml
View File

@ -482,7 +482,7 @@ la textura:
<spinner label="Horas de acceso:" name="HoursSpin"/>
<panel name="Allowed_layout_panel">
<text label="Always Allow" name="AllowedText">
Residentes autorizados
Residentes autorizados ([LISTED]/[MAX])
</text>
<name_list name="AccessList" tool_tip="([LISTED] listados de un máx. de [MAX])"/>
<button label="Añadir" name="add_allowed"/>
@ -490,7 +490,7 @@ la textura:
</panel>
<panel name="Banned_layout_panel">
<text label="Ban" name="BanCheck">
Residentes con el acceso prohibido
Residentes con el acceso prohibido ([LISTED]/[MAX])
</text>
<name_list name="BannedList" tool_tip="([LISTED] listados de un máx. de [MAX])"/>
<button label="Añadir" name="add_banned"/>

4
indra/newview/skins/vintage/xui/fr/floater_about_land.xml
View File

@ -490,7 +490,7 @@ musique :
<spinner label="Durée en heures :" name="HoursSpin"/>
<panel name="Allowed_layout_panel">
<text label="Toujours autoriser" name="AllowedText">
Résidents autorisés
Résidents autorisés ([LISTED]/[MAX])
</text>
<name_list name="AccessList" tool_tip="([LISTED] dans la liste, [MAX] max.)"/>
<button label="Ajouter" name="add_allowed"/>
@ -498,7 +498,7 @@ musique :
</panel>
<panel name="Banned_layout_panel">
<text label="Bannir" name="BanCheck">
Résidents bannis
Résidents bannis ([LISTED]/[MAX])
</text>
<name_list name="BannedList" tool_tip="([LISTED] dans la liste, [MAX] max.)"/>
<button label="Ajouter" name="add_banned"/>

4
indra/newview/skins/vintage/xui/it/floater_about_land.xml
View File

@ -485,7 +485,7 @@ Media:
<spinner label="Ore di accesso:" name="HoursSpin"/>
<panel name="Allowed_layout_panel">
<text label="Consenti sempre" name="AllowedText">
Residenti consentiti
Residenti consentiti ([LISTED]/[MAX])
</text>
<name_list name="AccessList" tool_tip="([LISTED] in lista, [MAX] max)"/>
<button label="Aggiungi" name="add_allowed"/>
@ -493,7 +493,7 @@ Media:
</panel>
<panel name="Banned_layout_panel">
<text label="Espelli" name="BanCheck">
Residenti con divieto
Residenti con divieto ([LISTED]/[MAX])
</text>
<name_list name="BannedList" tool_tip="([LISTED] in lista, [MAX] max)"/>
<button label="Aggiungi" name="add_banned"/>

4
indra/newview/skins/vintage/xui/pl/floater_about_land.xml
View File

@ -457,7 +457,7 @@ teksturę:
<spinner label="Godziny dostępu:" name="HoursSpin"/>
<panel name="Allowed_layout_panel">
<text label="Zawsze Zezwalaj" name="AllowedText">
Dozwoleni Rezydenci
Dozwoleni Rezydenci ([LISTED]/[MAX])
</text>
<name_list name="AccessList" tool_tip="([LISTED] na liście, [MAX] maksimum)"/>
<button label="Dodaj" name="add_allowed"/>
@ -465,7 +465,7 @@ teksturę:
</panel>
<panel name="Banned_layout_panel">
<text label="Banuj" name="BanCheck">
Zbanowani Rezydenci
Zbanowani Rezydenci ([LISTED]/[MAX])
</text>
<name_list name="BannedList" tool_tip="([LISTED] na liście, [MAX] maksimum)"/>
<button label="Dodaj" name="add_banned"/>

4
indra/newview/skins/vintage/xui/pt/floater_about_land.xml
View File

@ -485,7 +485,7 @@ Mídia:
<spinner label="Horas de acesso:" name="HoursSpin"/>
<panel name="Allowed_layout_panel">
<text label="Always Allow" name="AllowedText">
Residentes permitidos
Residentes permitidos ([LISTED]/[MAX])
</text>
<name_list name="AccessList" tool_tip="(Total [LISTED], máx de [MAX])"/>
<button label="Adicionar" name="add_allowed"/>
@ -493,7 +493,7 @@ Mídia:
</panel>
<panel name="Banned_layout_panel">
<text label="Ban" name="BanCheck">
Residentes banidos
Residentes banidos ([LISTED]/[MAX])
</text>
<name_list name="BannedList" tool_tip="(Total [LISTED], máx de [MAX])"/>
<button label="Adicionar" name="add_banned"/>

4
indra/newview/skins/vintage/xui/ru/floater_about_land.xml
View File

@ -468,7 +468,7 @@
<spinner label="Часы доступа:" name="HoursSpin"/>
<panel name="Allowed_layout_panel">
<text label="Всегда разрешено" name="AllowedText">
Допущенные жители
Допущенные жители ([LISTED]/[MAX])
</text>
<name_list name="AccessList" tool_tip="([LISTED] в списке, [MAX] максимум)"/>
<button label="Добавить" name="add_allowed"/>
@ -476,7 +476,7 @@
</panel>
<panel name="Banned_layout_panel">
<text label="Бан" name="BanCheck">
Забаненные жители
Забаненные жители ([LISTED]/[MAX])
</text>
<name_list name="BannedList" tool_tip="([LISTED] в списке, [MAX] максимум)"/>
<button label="Добавить" name="add_banned"/>

4
indra/newview/skins/vintage/xui/tr/floater_about_land.xml
View File

@ -468,7 +468,7 @@ Sadece büyük parseller aramada görünür.
<spinner label="Erişim saatleri:" name="HoursSpin"/>
<panel name="Allowed_layout_panel">
<text label="Her Zaman İzin Ver" name="AllowedText">
İzin Verilen Sakinler
İzin Verilen Sakinler ([LISTED]/[MAX])
</text>
<name_list name="AccessList" tool_tip="([LISTED] listeli, [MAX] maksimum)"/>
<button label="Ekle" name="add_allowed"/>
@ -476,7 +476,7 @@ Sadece büyük parseller aramada görünür.
</panel>
<panel name="Banned_layout_panel">
<text label="Yasakla" name="BanCheck">
Yasaklı Sakinler
Yasaklı Sakinler ([LISTED]/[MAX])
</text>
<name_list name="BannedList" tool_tip="([LISTED] listeli, [MAX] maksimum)"/>
<button label="Ekle" name="add_banned"/>