QAR-1476 Combo-merge to trunk: Viewer 1.23 RC0 and Simulator 1.26.3

svn merge -r118927:118939
svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-1.23.0-merge-2-combo-QAR-1476

this is a composite of...

svn merge -r115088:118182
svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer_1-23
conflicts resolved:
C      doc/contributions.txt
C      indra/llaudio/audioengine.cpp
C      indra/newview/CMakeLists.txt
C      indra/newview/llfloaterlandholdings.cpp
C      indra/newview/llpaneldirbrowser.cpp
C      indra/newview/llpanelgrouplandmoney.cpp
C      indra/newview/llpreviewscript.cpp
C      indra/newview/llviewermenu.cpp
C      indra/newview/skins/default/xui/en-us/notifications.xml

and...

svn merge -r116937:118673
svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.26
minor-to-trivial conflicts resolved:
C      indra/llcommon/llversionserver.h
C      indra/newsim/llrezdata.cpp
C      indra/newsim/llstate.cpp
C      indra/upgrade/schema_version/sequence/3/index_log_paypal.sql

1 files changed, 55 insertions, 0 deletions

diff --git a/indra/newview/skins/default/xui/it/floater_top_objects.xml b/indra/newview/skins/default/xui/it/floater_top_objects.xml
new file mode 100644
index 0000000000..95bb0e3597
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/floater_top_objects.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>

+<floater name="top_objects" title="In caricamento...">

+	<text name="title_text">

+		In caricamento...

+	</text>

+	<scroll_list name="objects_list">

+		<column label="Punteggio" name="score"/>

+		<column label="Nome" name="name"/>

+		<column label="Proprietario" name="owner"/>

+		<column label="Ubicazione" name="location"/>

+		<column label="Ora" name="time"/>

+		<column label="Ora (Mono)" name="mono_time"/>

+	</scroll_list>

+	<text name="id_text">

+		ID oggetto:

+	</text>

+	<button label="Mostra segnali luminosi" name="show_beacon_btn"/>

+	<text name="obj_name_text">

+		Nome oggetto:

+	</text>

+	<button label="Filtro" name="filter_object_btn"/>

+	<text name="owner_name_text">

+		Nome oggetto:

+	</text>

+	<button label="Filtro" name="filter_owner_btn"/>

+	<button label="Restituisci selezionato" name="return_selected_btn"/>

+	<button label="Restituisci tutti" name="return_all_btn"/>

+	<button label="Disabilita selezionato" name="disable_selected_btn"/>

+	<button label="Disabilita per tutti" name="disable_all_btn"/>

+	<button label="Aggiorna" name="refresh_btn"/>

+	<string name="top_scripts_title">

+		Script pesanti

+	</string>

+	<string name="top_scripts_text">

+		[COUNT] script richiedono un totale di [TIME] ms

+	</string>

+	<string name="scripts_score_label">

+		Ora

+	</string>

+	<string name="scripts_mono_time_label">

+		Ora &apos;Mono&apos;

+	</string>

+	<string name="top_colliders_title">

+		Oggetti con maggiori collisioni

+	</string>

+	<string name="top_colliders_text">

+		I [COUNT] oggetti che sperimentano il maggior numero di collisioni

+	</string>

+	<string name="colliders_score_label">

+		Punteggio

+	</string>

+	<string name="none_descriptor">

+		Nulla di rilevato.

+	</string>

+</floater>