Skip to content
Snippets Groups Projects
Commit 7c3a81f5 authored by Christian Goetze (CG)'s avatar Christian Goetze (CG)
Browse files

Merge in lenny work

parents 0974f18d 27bbf79c
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 145 additions and 252 deletions
doc/contributions.txt
+ 3
− 0
View file @ 7c3a81f5
......@@ -162,6 +162,7 @@ Boroondas Gupte
SNOW-527
SNOW-610
SNOW-624
SNOW-737
VWR-233
WEB-262
Bulli Schumann
......@@ -645,6 +646,7 @@ Teardrops Fall
Techwolf Lupindo
SNOW-92
SNOW-649
SNOW-687
SNOW-680
SNOW-681
SNOW-690
......@@ -655,6 +657,7 @@ Tharax Ferraris
VWR-605
Thickbrick Sleaford
SNOW-207
SNOW-390
SNOW-421
SNOW-462
SNOW-586
......
indra/cmake/PNG.cmake
+ 1
− 1
View file @ 7c3a81f5
......@@ -9,5 +9,5 @@ if (STANDALONE)
else (STANDALONE)
use_prebuilt_binary(libpng)
set(PNG_LIBRARIES png12)
set(PNG_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include)
set(PNG_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/libpng12)
endif (STANDALONE)
indra/llimage/llpngwrapper.cpp
+ 2
− 2
View file @ 7c3a81f5
......@@ -210,7 +210,7 @@ void LLPngWrapper::normalizeImage()
}
if (mColorType == PNG_COLOR_TYPE_GRAY && mBitDepth < 8)
{
png_set_gray_1_2_4_to_8(mReadPngPtr);
png_set_expand_gray_1_2_4_to_8(mReadPngPtr);
}
if (mColorType == PNG_COLOR_TYPE_GRAY
|| mColorType == PNG_COLOR_TYPE_GRAY_ALPHA)
......@@ -358,7 +358,7 @@ void LLPngWrapper::releaseResources()
{
if (mReadPngPtr || mReadInfoPtr)
{
png_destroy_read_struct(&mReadPngPtr, &mReadInfoPtr, png_infopp_NULL);
png_destroy_read_struct(&mReadPngPtr, &mReadInfoPtr, NULL);
mReadPngPtr = NULL;
mReadInfoPtr = NULL;
}
......
indra/llimage/llpngwrapper.h
+ 1
− 1
View file @ 7c3a81f5
......@@ -26,7 +26,7 @@
#ifndef LL_LLPNGWRAPPER_H
#define LL_LLPNGWRAPPER_H
#include "libpng12/png.h"
#include "png.h"
#include "llimage.h"
class LLPngWrapper
......
indra/newview/llappviewer.cpp
+ 2
− 1
View file @ 7c3a81f5
......@@ -928,8 +928,9 @@ bool LLAppViewer::init()
//EXT-7013 - On windows for some locale (Japanese) standard
//datetime formatting functions didn't support some parameters such as "weekday".
//Names for days and months localized in xml are also useful for Polish locale(STORM-107).
std::string language = LLControlGroup::getInstance(sGlobalSettingsName)->getString("Language");
if(language == "ja")
if(language == "ja" || language == "pl")
{
LLStringOps::setupWeekDaysNames(LLTrans::getString("dateTimeWeekdaysNames"));
LLStringOps::setupWeekDaysShortNames(LLTrans::getString("dateTimeWeekdaysShortNames"));
......
indra/newview/llcofwearables.cpp
+ 18
− 1
View file @ 7c3a81f5
......@@ -397,12 +397,20 @@ void LLCOFWearables::refresh()
mCOFVersion = catp->getVersion();
// Save current scrollbar position.
typedef std::map<LLFlatListView*, LLRect> scroll_pos_map_t;
scroll_pos_map_t saved_scroll_pos;
saved_scroll_pos[mAttachments] = mAttachments->getVisibleContentRect();
saved_scroll_pos[mClothing] = mClothing->getVisibleContentRect();
saved_scroll_pos[mBodyParts] = mBodyParts->getVisibleContentRect();
// Save current selection.
typedef std::vector<LLSD> values_vector_t;
typedef std::map<LLFlatListView*, values_vector_t> selection_map_t;
selection_map_t preserve_selection;
// Save current selection
mAttachments->getSelectedValues(preserve_selection[mAttachments]);
mClothing->getSelectedValues(preserve_selection[mClothing]);
mBodyParts->getSelectedValues(preserve_selection[mBodyParts]);
......@@ -450,6 +458,15 @@ void LLCOFWearables::refresh()
list->setCommitOnSelectionChange(true);
}
// Restore previous scrollbar position.
for (scroll_pos_map_t::const_iterator it = saved_scroll_pos.begin(); it != saved_scroll_pos.end(); ++it)
{
LLFlatListView* list = it->first;
LLRect scroll_pos = it->second;
list->scrollToShowRect(scroll_pos);
}
}
......
indra/newview/llsidepanelappearance.cpp
+ 2
− 0
View file @ 7c3a81f5
......@@ -286,6 +286,8 @@ void LLSidepanelAppearance::showOutfitsInventoryPanel()
void LLSidepanelAppearance::showOutfitEditPanel()
{
if (mOutfitEdit && mOutfitEdit->getVisible()) return;
// Accordion's state must be reset in all cases except the one when user
// is returning back to the mOutfitEdit panel from the mEditWearable panel.
// The simplest way to control this is to check the visibility state of the mEditWearable
......
indra/newview/llstatusbar.cpp
+ 0
− 74
View file @ 7c3a81f5
......@@ -107,10 +107,6 @@ const S32 TEXT_HEIGHT = 18;
static void onClickVolume(void*);
std::vector<std::string> LLStatusBar::sDays;
std::vector<std::string> LLStatusBar::sMonths;
const U32 LLStatusBar::MAX_DATE_STRING_LENGTH = 2000;
LLStatusBar::LLStatusBar(const LLRect& rect)
: LLPanel(),
mTextTime(NULL),
......@@ -127,10 +123,6 @@ LLStatusBar::LLStatusBar(const LLRect& rect)
// status bar can possible overlay menus?
setMouseOpaque(FALSE);
// size of day of the weeks and year
sDays.reserve(7);
sMonths.reserve(12);
mBalanceTimer = new LLFrameTimer();
mHealthTimer = new LLFrameTimer();
......@@ -169,9 +161,6 @@ BOOL LLStatusBar::postBuild()
{
gMenuBarView->setRightMouseDownCallback(boost::bind(&show_navbar_context_menu, _1, _2, _3));
// build date necessary data (must do after panel built)
setupDate();
mTextTime = getChild<LLTextBox>("TimeText" );
getChild<LLUICtrl>("buyL")->setCommitCallback(
......@@ -517,69 +506,6 @@ void LLStatusBar::onClickMediaToggle(void* data)
LLViewerMedia::setAllMediaEnabled(enable);
}
// sets the static variables necessary for the date
void LLStatusBar::setupDate()
{
// fill the day array with what's in the xui
std::string day_list = getString("StatBarDaysOfWeek");
size_t length = day_list.size();
// quick input check
if(length < MAX_DATE_STRING_LENGTH)
{
// tokenize it and put it in the array
std::string cur_word;
for(size_t i = 0; i < length; ++i)
{
if(day_list[i] == ':')
{
sDays.push_back(cur_word);
cur_word.clear();
}
else
{
cur_word.append(1, day_list[i]);
}
}
sDays.push_back(cur_word);
}
// fill the day array with what's in the xui
std::string month_list = getString( "StatBarMonthsOfYear" );
length = month_list.size();
// quick input check
if(length < MAX_DATE_STRING_LENGTH)
{
// tokenize it and put it in the array
std::string cur_word;
for(size_t i = 0; i < length; ++i)
{
if(month_list[i] == ':')
{
sMonths.push_back(cur_word);
cur_word.clear();
}
else
{
cur_word.append(1, month_list[i]);
}
}
sMonths.push_back(cur_word);
}
// make sure we have at least 7 days and 12 months
if(sDays.size() < 7)
{
sDays.resize(7);
}
if(sMonths.size() < 12)
{
sMonths.resize(12);
}
}
// static
void LLStatusBar::onClickStatGraph(void* data)
{
......
indra/newview/llstatusbar.h
+ 1
− 6
View file @ 7c3a81f5
......@@ -85,9 +85,7 @@ public:
LLPanelNearByMedia* getNearbyMediaPanel() { return mPanelNearByMedia; }
private:
// simple method to setup the part that holds the date
void setupDate();
void onClickBuyCurrency();
void onVolumeChanged(const LLSD& newvalue);
......@@ -117,9 +115,6 @@ private:
LLFrameTimer* mHealthTimer;
LLPanelVolumePulldown* mPanelVolumePulldown;
LLPanelNearByMedia* mPanelNearByMedia;
static std::vector<std::string> sDays;
static std::vector<std::string> sMonths;
static const U32 MAX_DATE_STRING_LENGTH;
};
// *HACK: Status bar owns your cached money balance. JC
......
indra/newview/llviewerobject.cpp
+ 1
− 1
View file @ 7c3a81f5
......@@ -1844,7 +1844,7 @@ U32 LLViewerObject::processUpdateMessage(LLMessageSystem *mesgsys,
if (cdp)
{
F32 ping_delay = 0.5f * mTimeDilation * ( ((F32)cdp->getPingDelay()) * 0.001f + gFrameDTClamped);
LLVector3 diff = getVelocity() * (0.5f*mTimeDilation*(gFrameDTClamped + ((F32)ping_delay)*0.001f));
LLVector3 diff = getVelocity() * ping_delay;
new_pos_parent += diff;
}
else
......
indra/newview/skins/default/xui/de/floater_about_land.xml
+ 6
− 6
View file @ 7c3a81f5
......@@ -259,18 +259,18 @@ werden.
<text left="204" name="other_objects_text" width="48">
[COUNT]
</text>
<button label="Anzeigen" label_selected="Anzeigen" name="ShowOther" right="-135" width="60"/>
<button label="Zurückgeben" label_selected="Zurückgeben..." name="ReturnOther..." right="-10" tool_tip="Objekte an ihre Eigentümer zurückgeben." width="119"/>
<text left="14" name="Selected / sat upon:" width="140">
<button label="Anzeigen" label_selected="Anzeigen" name="ShowOther"/>
<button label="Zurückgeben" label_selected="Zurückgeben..." name="ReturnOther..." tool_tip="Objekte an ihre Eigentümer zurückgeben."/>
<text name="Selected / sat upon:">
Ausgewählt/gesessen auf:
</text>
<text left="204" name="selected_objects_text" width="48">
<text name="selected_objects_text">
[COUNT]
</text>
<text name="Autoreturn">
Objekte anderer Einwohner automatisch zurückgeben (Minuten, 0 für aus):
</text>
<line_editor name="clean other time" right="-10" width="56"/>
<line_editor name="clean other time"/>
<text name="Object Owners:">
Objekteigentümer:
</text>
......@@ -279,7 +279,7 @@ werden.
<name_list name="owner list">
<name_list.columns label="Typ" name="type"/>
<name_list.columns label="Name" name="name"/>
<name_list.columns label="Anzahl" name="count" width="80"/>
<name_list.columns label="Anzahl" name="count"/>
<name_list.columns label="Aktuellstes" name="mostrecent"/>
</name_list>
</panel>
......
indra/newview/skins/default/xui/en/floater_about_land.xml
+ 4
− 4
View file @ 7c3a81f5
......@@ -1044,7 +1044,7 @@ Leyla Linden </text>
left="28"
name="Selected / sat upon:"
top_pad="5"
width="176">
width="230">
Selected / sat upon:
</text>
<text
......@@ -1053,7 +1053,7 @@ Leyla Linden </text>
follows="left|top"
height="23"
layout="topleft"
left_delta="172"
left_delta="220"
name="selected_objects_text"
top_delta="0"
width="48">
......@@ -1143,11 +1143,11 @@ Leyla Linden </text>
<name_list.columns
label="Count"
name="count"
width="60" />
width="67" />
<name_list.columns
label="Most Recent"
name="mostrecent"
width="170" />
width="163" />
</name_list>
</panel>
<panel
......
indra/newview/skins/default/xui/en/floater_day_cycle_options.xml
+ 12
− 12
View file @ 7c3a81f5
......@@ -359,9 +359,9 @@
increment="1"
initial_value="0"
label="Hour"
label_width="30"
label_width="35"
layout="topleft"
left_delta="25"
left_delta="20"
max_val="100"
name="WLCurKeyHour"
top_pad="4"
......@@ -374,13 +374,13 @@
increment="5"
initial_value="0"
label="Min"
label_width="20"
label_width="45"
layout="topleft"
left_pad="5"
max_val="55"
name="WLCurKeyMin"
top_delta="0"
width="60" />
width="85" />
<text
type="string"
length="1"
......@@ -456,9 +456,9 @@
increment="1"
initial_value="0"
label="Hour"
label_width="30"
label_width="33"
layout="topleft"
left_delta="0"
left_delta="-3"
max_val="100"
name="WLLengthOfDayHour"
top_pad="4"
......@@ -471,13 +471,13 @@
increment="1"
initial_value="0"
label="Min"
label_width="20"
label_width="25"
layout="topleft"
left_pad="5"
left_pad="2"
max_val="59"
name="WLLengthOfDayMin"
top_delta="0"
width="60" />
width="65" />
<spinner
control_name="WLLengthOfDaySec"
decimal_digits="0"
......@@ -486,13 +486,13 @@
increment="1"
initial_value="24"
label="Sec"
label_width="20"
label_width="25"
layout="topleft"
left_pad="5"
left_pad="2"
max_val="59"
name="WLLengthOfDaySec"
top_delta="0"
width="60"/>
width="65"/>
<text
type="string"
halign="right"
......
indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml
+ 11
− 53
View file @ 7c3a81f5
......@@ -177,36 +177,16 @@ background_visible="true"
</accordion>
</layout_panel>
</layout_stack>
<layout_stack
name="layout"
orientation="horizontal"
follows="bottom|left|right"
left="8"
top_pad="0"
height="30"
width="292"
border_size="0">
<layout_panel
height="30"
layout="topleft"
auto_resize="false"
left="0"
top_pad="0"
name="button_row"
follows="bottom|left|right"
width="313">
<layout_stack
follows="bottom|left|right"
height="25"
layout="topleft"
name="button_row_ls"
left="2"
left="6"
orientation="horizontal"
top_pad="5"
width="309">
width="297">
<layout_panel
follows="bottom|left|right"
......@@ -215,7 +195,7 @@ background_visible="true"
left="0"
name="btn_refresh_lp"
user_resize="false"
auto_resize="true"
auto_resize="false"
width="24">
<button
follows="bottom|left|right"
......@@ -236,7 +216,7 @@ background_visible="true"
name="btn_chat_lp"
user_resize="false"
auto_resize="true"
width="83">
width="91">
<button
follows="bottom|left|right"
label="Chat"
......@@ -244,7 +224,7 @@ background_visible="true"
left="1"
height="23"
top="0"
width="82" />
width="90" />
</layout_panel>
<layout_panel
......@@ -255,7 +235,7 @@ background_visible="true"
name="call_btn_lp"
user_resize="false"
auto_resize="true"
width="113">
width="91">
<button
follows="bottom|left|right"
left="1"
......@@ -265,7 +245,7 @@ background_visible="true"
layout="topleft"
tool_tip="Call this group"
top="0"
width="112" />
width="90" />
</layout_panel>
<layout_panel
......@@ -276,7 +256,7 @@ background_visible="true"
name="btn_apply_lp"
user_resize="false"
auto_resize="true"
width="83">
width="91">
<button
follows="bottom|left|right"
height="23"
......@@ -285,18 +265,7 @@ background_visible="true"
name="btn_apply"
left="1"
top="0"
width="82" />
</layout_panel>
<layout_panel
follows="bottom|left|right"
height="23"
layout="bottomleft"
left_pad="3"
name="btn_create_lp"
user_resize="false"
auto_resize="true"
width="104">
width="90" />
<button
follows="bottom|left|right"
height="23"
......@@ -307,19 +276,8 @@ background_visible="true"
name="btn_create"
visible="true"
tool_tip="Create a new Group"
width="103" />
width="90" />
</layout_panel>
</layout_stack>
<!--<button
left_pad="3"
height="23"
label="Cancel"
label_selected="Cancel"
name="btn_cancel"
visible="false"
width="65" />-->
</layout_panel>
</layout_stack>
</layout_stack>
</panel>
indra/newview/skins/default/xui/en/panel_profile.xml
+ 4
− 4
View file @ 7c3a81f5
......@@ -344,7 +344,7 @@
name="add_friend_btn_lp"
user_resize="false"
auto_resize="true"
width="118">
width="121">
<button
follows="bottom|left|right"
height="23"
......@@ -355,7 +355,7 @@
name="add_friend"
tool_tip="Offer friendship to the Resident"
top="0"
width="117" />
width="120" />
</layout_panel>
<layout_panel
......@@ -430,8 +430,8 @@
left_pad="3"
name="overflow_btn_lp"
user_resize="false"
auto_resize="true"
width="27">
auto_resize="false"
width="24">
<button
follows="bottom|left|right"
height="23"
......
indra/newview/skins/default/xui/en/panel_status_bar.xml
+ 0
− 8
View file @ 7c3a81f5
......@@ -13,14 +13,6 @@
top="19"
tab_stop="false"
width="1000">
<panel.string
name="StatBarDaysOfWeek">
Sunday:Monday:Tuesday:Wednesday:Thursday:Friday:Saturday
</panel.string>
<panel.string
name="StatBarMonthsOfYear">
January:February:March:April:May:June:July:August:September:October:November:December
</panel.string>
<panel.string
name="packet_loss_tooltip">
Packet Loss
......
indra/newview/skins/default/xui/es/floater_about_land.xml
+ 22
− 22
View file @ 7c3a81f5
......@@ -221,60 +221,60 @@ Vaya al menú Mundo &gt; Acerca del terreno o seleccione otra parcela para ver s
<text name="Simulator primitive usage:">
Uso de primitivas:
</text>
<text left="204" name="objects_available" width="250">
<text name="objects_available">
[COUNT] de un máx. de [MAX] ([AVAILABLE] disponibles)
</text>
<text name="Primitives parcel supports:" width="200">
<text name="Primitives parcel supports:">
Prims que admite la parcela:
</text>
<text left="204" name="object_contrib_text" width="152">
<text name="object_contrib_text">
[COUNT]
</text>
<text name="Primitives on parcel:">
Prims en la parcela:
</text>
<text left="204" name="total_objects_text" width="48">
<text name="total_objects_text">
[COUNT]
</text>
<text left="14" name="Owned by parcel owner:" width="180">
<text name="Owned by parcel owner:">
Del propietario de la parcela:
</text>
<text left="204" name="owner_objects_text" width="48">
<text name="owner_objects_text">
[COUNT]
</text>
<button label="Mostrar" label_selected="Mostrar" name="ShowOwner" right="-135" width="60"/>
<button label="Devolver" name="ReturnOwner..." right="-10" tool_tip="Devolver los objetos a sus propietarios." width="119"/>
<text left="14" name="Set to group:" width="180">
<button label="Mostrar" label_selected="Mostrar" name="ShowOwner"/>
<button label="Devolver" name="ReturnOwner..." tool_tip="Devolver los objetos a sus propietarios."/>
<text name="Set to group:">
Del grupo:
</text>
<text left="204" name="group_objects_text" width="48">
<text name="group_objects_text">
[COUNT]
</text>
<button label="Mostrar" label_selected="Mostrar" name="ShowGroup" right="-135" width="60"/>
<button label="Devolver" name="ReturnGroup..." right="-10" tool_tip="Devolver los objetos a sus propietarios." width="119"/>
<text left="14" name="Owned by others:" width="128">
<button label="Mostrar" label_selected="Mostrar" name="ShowGroup"/>
<button label="Devolver" name="ReturnGroup..." tool_tip="Devolver los objetos a sus propietarios."/>
<text name="Owned by others:">
Propiedad de otros:
</text>
<text left="204" name="other_objects_text" width="48">
<text name="other_objects_text">
[COUNT]
</text>
<button label="Mostrar" label_selected="Mostrar" name="ShowOther" right="-135" width="60"/>
<button label="Devolver" name="ReturnOther..." right="-10" tool_tip="Devolver los objetos a sus propietarios." width="119"/>
<text left="14" name="Selected / sat upon:" width="193">
<button label="Mostrar" label_selected="Mostrar" name="ShowOther"/>
<button label="Devolver" name="ReturnOther..." tool_tip="Devolver los objetos a sus propietarios."/>
<text name="Selected / sat upon:">
Seleccionados / con gente sentada:
</text>
<text left="204" name="selected_objects_text" width="48">
<text name="selected_objects_text">
[COUNT]
</text>
<text name="Autoreturn">
Devolución automát. de objetos de otros (en min., 0 la desactiva):
</text>
<line_editor name="clean other time" right="-20"/>
<text name="Object Owners:" width="150">
<line_editor name="clean other time"/>
<text name="Object Owners:">
Propietarios de los objetos:
</text>
<button label="Actualizar la lista" label_selected="Actualizar la lista" left="158" name="Refresh List" tool_tip="Refresh Object List"/>
<button label="Devolver los objetos" left="270" name="Return objects..." width="164"/>
<button label="Actualizar la lista" label_selected="Actualizar la lista" name="Refresh List" tool_tip="Refresh Object List"/>
<button label="Devolver los objetos" name="Return objects..."/>
<name_list name="owner list">
<name_list.columns label="Tipo" name="type"/>
<name_list.columns label="Nombre" name="name"/>
......
indra/newview/skins/default/xui/es/strings.xml
+ 2
− 2
View file @ 7c3a81f5
......@@ -1660,7 +1660,7 @@
Script nuevo
</string>
<string name="BusyModeResponseDefault">
El Residente al que has enviado un mensaje ha solicitado que no se le moleste porque está en modo ocupado. Podrá ver tu mensaje más adelante, ya que éste aparecerá en su panel de MI.
El Residente al que has enviado un mensaje ha solicitado que no se le moleste porque está en modo ocupado. Podrá ver tu mensaje más adelante, ya que éste aparecerá en su panel de MI.
</string>
<string name="NoOutfits">
Todavía no tienes vestuario. Intenta con [secondlife:///app/search/all/ Buscar]
......@@ -3802,7 +3802,7 @@ Denuncia de infracción
PM
</string>
<string name="LocalEstimateUSD">
[AMOUNT] dólares estadounidenses
[AMOUNT] US$
</string>
<string name="Membership">
Membresía
......
indra/newview/skins/default/xui/fr/floater_about_land.xml
+ 31
− 32
View file @ 7c3a81f5
......@@ -225,55 +225,55 @@ ou divisé.
<text name="Simulator primitive usage:">
Utilisation des primitives :
</text>
<text left="214" name="objects_available" width="230">
<text name="objects_available">
[COUNT] sur [MAX] ([AVAILABLE] disponibles)
</text>
<text name="Primitives parcel supports:" width="200">
<text name="Primitives parcel supports:">
Prims max. sur la parcelle :
</text>
<text left="214" name="object_contrib_text" width="152">
<text name="object_contrib_text">
[COUNT]
</text>
<text name="Primitives on parcel:">
Prims sur la parcelle :
</text>
<text left="214" name="total_objects_text" width="48">
<text name="total_objects_text">
[COUNT]
</text>
<text left="14" name="Owned by parcel owner:" width="180">
<text name="Owned by parcel owner:">
Appartenant au propriétaire :
</text>
<text left="214" name="owner_objects_text" width="48">
<text name="owner_objects_text">
[COUNT]
</text>
<button label="Afficher" label_selected="Afficher" name="ShowOwner" right="-135" width="60"/>
<button label="Retour" label_selected="Renvoyer..." name="ReturnOwner..." right="-10" tool_tip="Renvoyer les objets à leurs propriétaires." width="119"/>
<text left="14" name="Set to group:" width="180">
<button label="Afficher" label_selected="Afficher" name="ShowOwner"/>
<button label="Retour" label_selected="Renvoyer..." name="ReturnOwner..." tool_tip="Renvoyer les objets à leurs propriétaires."/>
<text name="Set to group:">
Données au groupe :
</text>
<text left="214" name="group_objects_text" width="48">
<text name="group_objects_text">
[COUNT]
</text>
<button label="Afficher" label_selected="Afficher" name="ShowGroup" right="-135" width="60"/>
<button label="Retour" label_selected="Renvoyer..." name="ReturnGroup..." right="-10" tool_tip="Renvoyer les objets à leurs propriétaires." width="119"/>
<text left="14" name="Owned by others:" width="128">
<button label="Afficher" label_selected="Afficher" name="ShowGroup" />
<button label="Retour" label_selected="Renvoyer..." name="ReturnGroup..." tool_tip="Renvoyer les objets à leurs propriétaires."/>
<text name="Owned by others:">
Appartenant à d&apos;autres :
</text>
<text left="214" name="other_objects_text" width="48">
<text name="other_objects_text">
[COUNT]
</text>
<button label="Afficher" label_selected="Afficher" name="ShowOther" right="-135" width="60"/>
<button label="Retour" label_selected="Renvoyer..." name="ReturnOther..." right="-10" tool_tip="Renvoyer les objets à leurs propriétaires." width="119"/>
<text left="14" name="Selected / sat upon:" width="220">
<button label="Afficher" label_selected="Afficher" name="ShowOther"/>
<button label="Retour" label_selected="Renvoyer..." name="ReturnOther..." tool_tip="Renvoyer les objets à leurs propriétaires."/>
<text name="Selected / sat upon:">
Sélectionnées/où quelqu&apos;un est assis :
</text>
<text left_delta="214" name="selected_objects_text" width="48">
<text name="selected_objects_text">
[COUNT]
</text>
<text name="Autoreturn">
Renvoi automatique des objets d&apos;autres résidents (minutes, 0 pour désactiver) :
</text>
<line_editor name="clean other time" right="-6" width="36"/>
<line_editor name="clean other time"/>
<text name="Object Owners:">
Propriétaires :
</text>
......@@ -281,10 +281,9 @@ ou divisé.
<button label="Renvoi des objets" label_selected="Renvoyer les objets..." name="Return objects..."/>
<name_list label="Plus récents" name="owner list">
<name_list.columns label="Type" name="type"/>
<name_list.columns name="online_status"/>
<name_list.columns label="Nom" name="name" width="100"/>
<name_list.columns label="Nombre" name="count" width="100"/>
<name_list.columns label="Plus récents" name="mostrecent" width="120"/>
<name_list.columns label="Nom" name="name"/>
<name_list.columns label="Nombre" name="count"/>
<name_list.columns label="Plus récents" name="mostrecent"/>
</name_list>
</panel>
<panel label="OPTIONS" name="land_options_panel">
......@@ -343,9 +342,9 @@ Seules les parcelles de grande taille peuvent apparaître dans la recherche.
Options du terrain :
</text>
<check_box label="Sécurisé (pas de dégâts)" name="check safe" tool_tip="Si cette option est cochée, le terrain est sécurisé et il n&apos;y pas de risques de dommages causés par des combats. Si elle est décochée, des dommages causés par les combats peuvent avoir lieu."/>
<check_box bottom="-140" label="Pas de bousculades" left="14" name="PushRestrictCheck" tool_tip="Empêche l&apos;utilisation de scripts causant des bousculades. Cette option est utile pour empêcher les comportements abusifs sur votre terrain."/>
<check_box bottom="-160" label="Afficher le lieu dans la recherche (30 L$/semaine)" name="ShowDirectoryCheck" tool_tip="Afficher la parcelle dans les résultats de recherche"/>
<combo_box bottom="-160" left="286" name="land category with adult" width="146">
<check_box label="Pas de bousculades" name="PushRestrictCheck" tool_tip="Empêche l&apos;utilisation de scripts causant des bousculades. Cette option est utile pour empêcher les comportements abusifs sur votre terrain."/>
<check_box label="Afficher le lieu dans la recherche (30 L$/semaine)" name="ShowDirectoryCheck" tool_tip="Afficher la parcelle dans les résultats de recherche"/>
<combo_box name="land category with adult">
<combo_box.item label="Toutes catégories" name="item0"/>
<combo_box.item label="Appartenant aux Lindens" name="item1"/>
<combo_box.item label="Adult" name="item2"/>
......@@ -360,7 +359,7 @@ Seules les parcelles de grande taille peuvent apparaître dans la recherche.
<combo_box.item label="Shopping" name="item11"/>
<combo_box.item label="Autre" name="item12"/>
</combo_box>
<combo_box bottom="-160" left="286" name="land category" width="146">
<combo_box name="land category">
<combo_box.item label="Toutes catégories" name="item0"/>
<combo_box.item label="Appartenant aux Lindens" name="item1"/>
<combo_box.item label="Art et Culture" name="item3"/>
......@@ -374,20 +373,20 @@ Seules les parcelles de grande taille peuvent apparaître dans la recherche.
<combo_box.item label="Shopping" name="item11"/>
<combo_box.item label="Autre" name="item12"/>
</combo_box>
<check_box bottom="-180" label="Contenu Modéré" name="MatureCheck" tool_tip=""/>
<text bottom="-200" name="Snapshot:">
<check_box label="Contenu Modéré" name="MatureCheck" tool_tip=""/>
<text name="Snapshot:">
Photo :
</text>
<texture_picker bottom="-319" label="" name="snapshot_ctrl" tool_tip="Cliquez pour sélectionner une image"/>
<texture_picker label="" name="snapshot_ctrl" tool_tip="Cliquez pour sélectionner une image"/>
<text name="landing_point">
Lieu d&apos;arrivée : [LANDING]
</text>
<button label="Définir" label_selected="Définir" name="Set" tool_tip="Définit le point d&apos;arrivée des visiteurs. Définit l&apos;emplacement de votre avatar sur ce terrain."/>
<button label="Annuler" label_selected="Annuler" name="Clear" tool_tip="Effacer le lieu d&apos;arrivée"/>
<text bottom="-343" name="Teleport Routing: ">
<text name="Teleport Routing: ">
Règles de téléportation :
</text>
<combo_box bottom="-343" left="140" name="landing type" tool_tip="Règles de téléportation - Choisissez les règles de téléportation sur votre terrain" width="140">
<combo_box name="landing type" tool_tip="Règles de téléportation - Choisissez les règles de téléportation sur votre terrain" width="140">
<combo_box.item label="Bloqué" name="Blocked"/>
<combo_box.item label="Lieu d&apos;arrivée fixe" name="LandingPoint"/>
<combo_box.item label="Lieu d&apos;arrivée libre" name="Anywhere"/>
......
indra/newview/skins/default/xui/it/floater_about_land.xml
+ 22
− 22
View file @ 7c3a81f5
......@@ -224,60 +224,60 @@ o suddivisa.
<text name="Simulator primitive usage:">
Uso delle primitive:
</text>
<text left="214" name="objects_available" width="230">
<text name="objects_available">
[COUNT] dei [MAX] ([AVAILABLE] dsponibili)
</text>
<text name="Primitives parcel supports:" width="200">
<text name="Primitives parcel supports:">
Oggetti che il terreno supporta:
</text>
<text left="214" name="object_contrib_text" width="152">
<text name="object_contrib_text">
[COUNT]
</text>
<text name="Primitives on parcel:">
Oggetti sul terreno:
</text>
<text left="214" name="total_objects_text" width="48">
<text name="total_objects_text">
[COUNT]
</text>
<text left="14" name="Owned by parcel owner:" width="180">
<text name="Owned by parcel owner:">
Posseduti dal proprietario:
</text>
<text left="214" name="owner_objects_text" width="48">
<text name="owner_objects_text">
[COUNT]
</text>
<button label="Mostra" label_selected="Mostra" name="ShowOwner" right="-135" width="60"/>
<button label="Restituisci" name="ReturnOwner..." right="-10" tool_tip="Restituisci gli oggetti ai loro proprietari." width="119"/>
<text left="14" name="Set to group:" width="180">
<button label="Mostra" label_selected="Mostra" name="ShowOwner"/>
<button label="Restituisci" name="ReturnOwner..." tool_tip="Restituisci gli oggetti ai loro proprietari."/>
<text name="Set to group:">
Imposta al gruppo:
</text>
<text left="214" name="group_objects_text" width="48">
<text name="group_objects_text">
[COUNT]
</text>
<button label="Mostra" label_selected="Mostra" name="ShowGroup" right="-135" width="60"/>
<button label="Restituisci" name="ReturnGroup..." right="-10" tool_tip="Restituisci gli oggetti ai loro proprietari." width="119"/>
<text left="14" name="Owned by others:" width="180">
<button label="Mostra" label_selected="Mostra" name="ShowGroup"/>
<button label="Restituisci" name="ReturnGroup..." tool_tip="Restituisci gli oggetti ai loro proprietari."/>
<text name="Owned by others:">
Posseduti da altri:
</text>
<text left="214" name="other_objects_text" width="48">
<text name="other_objects_text">
[COUNT]
</text>
<button label="Mostra" label_selected="Mostra" name="ShowOther" right="-135" width="60"/>
<button label="Restituisci" name="ReturnOther..." right="-10" tool_tip="Restituisci gli oggetti ai loro proprietari." width="119"/>
<text left="14" name="Selected / sat upon:" width="193">
<button label="Mostra" label_selected="Mostra" name="ShowOther"/>
<button label="Restituisci" name="ReturnOther..." tool_tip="Restituisci gli oggetti ai loro proprietari."/>
<text name="Selected / sat upon:">
Selezionati / sui quali sei sopra:
</text>
<text left="214" name="selected_objects_text" width="48">
<text name="selected_objects_text">
[COUNT]
</text>
<text name="Autoreturn">
Restituzione automatica degli oggetti di altri residenti (minuti, 0 per disattivarla):
</text>
<line_editor name="clean other time" right="-20"/>
<text name="Object Owners:" width="150">
<line_editor name="clean other time"/>
<text name="Object Owners:">
Proprietari degli oggetti:
</text>
<button label="Aggiorna Elenco" label_selected="Aggiorna Elenco" left="158" name="Refresh List" tool_tip="Refresh Object List"/>
<button label="Restituisci oggetti..." label_selected="Restituisci oggetti..." left="270" name="Return objects..." width="164"/>
<button label="Aggiorna Elenco" label_selected="Aggiorna Elenco" name="Refresh List" tool_tip="Refresh Object List"/>
<button label="Restituisci oggetti..." label_selected="Restituisci oggetti..." name="Return objects..."/>
<name_list name="owner list">
<name_list.columns label="Tipo" name="type"/>
<name_list.columns label="Nome" name="name"/>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment