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, 49 insertions, 45 deletions

diff --git a/indra/newview/skins/default/xui/da/panel_preferences_chat.xml b/indra/newview/skins/default/xui/da/panel_preferences_chat.xml
index 0b516eac65..6e15a7ef4b 100644
--- a/indra/newview/skins/default/xui/da/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/da/panel_preferences_chat.xml
@@ -1,57 +1,61 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>

-<panel label="Tekst Chat" name="chat">

-	<text length="1" name="text_box" type="string">

-		Chat Skrift Størrelse:

+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

+<panel label="Tekst chat" name="chat">

+	<text type="string" length="1" name="text_box">

+		Chat skriftstørrelse:

 	</text>

 	<radio_group name="chat_font_size">

-		<radio_item name="radio">

+		<radio_item type="string" length="1" name="radio">

 			Lille

 		</radio_item>

-		<radio_item name="radio2">

+		<radio_item type="string" length="1" name="radio2">

 			Mellem

 		</radio_item>

-		<radio_item name="radio3">

+		<radio_item type="string" length="1" name="radio3">

 			Stor

 		</radio_item>

 	</radio_group>

-	<text length="1" name="text_box2" type="string">

-		Chat Farve:

-	</text>

-	<color_swatch label="Dig" name="user"/>

-	<color_swatch label="Andre" name="agent"/>

-	<color_swatch label="IM" name="im"/>

-	<color_swatch label="System" name="system"/>

-	<color_swatch label="Fejl" name="script_error"/>

-	<color_swatch label="Objekter" name="objects"/>

-	<color_swatch label="Ejer" name="owner"/>

-	<color_swatch label="Bobler" name="background"/>

-	<color_swatch label="URLs" name="links"/>

-	<text length="1" name="text_box8" type="string">

-		Kodnings fejl:

-	</text>

-	<check_box label="Vis kodnings fejl og advarsler i almindelig chat" name="script_errors_as_chat"/>

-	<text length="1" name="text_box3" type="string">

-		Chat Vindue:

-	</text>

-	<spinner label="Fade chat efter" name="fade_chat_time"/>

-	<text length="1" name="text_box4" type="string">

+	<text type="string" length="1" name="text_box2">

+		Chat farve:

+	</text>

+	<color_swatch label="Dig" name="user" />

+	<color_swatch label="Andre" name="agent" />

+	<color_swatch label="IM" name="im" />

+	<color_swatch label="System" name="system" />

+	<color_swatch label="Fejl" name="script_error" />

+	<color_swatch label="Objekter" name="objects" />

+	<color_swatch label="Ejer" name="owner" />

+	<color_swatch label="Bobler" name="background" />

+	<color_swatch label="URL&apos;er" name="links" />

+	<text type="string" length="1" name="text_box8">

+		Script fejl:

+	</text>

+	<check_box label="Vis script fejl og advarsler i almindelig chat"

+	     name="script_errors_as_chat" />

+	<text type="string" length="1" name="text_box3">

+		Chat vindue:

+	</text>

+	<spinner label="Udfas chat efter" name="fade_chat_time" label_width="90" width="140" />

+	<text type="string" length="1" name="text_box4" left="292" >

 		(sekunder)

 	</text>

-	<text length="1" name="text_box5" type="string">

-		(# linjer)

-	</text>

-	<slider label="Opacitet" name="console_opacity"/>

-	<check_box label="Brug fuldskærms bredde  (Kræver genstart)" name="chat_full_width_check"/>

-	<text length="1" name="text_box6" type="string">

-		Chat Indstillinger:

-	</text>

-	<check_box label="Luk chat efter tryk på enter" name="close_chat_on_return_check"/>

-	<check_box label="Piletaster flytter altid figur under chat" name="arrow_keys_move_avatar_check"/>

-	<check_box label="Vis klokkeslæt i lokal chat" name="show_timestamps_check"/>

-	<check_box label="Afspil skrive animation ved chat" name="play_typing_animation"/>

-	<text length="1" name="text_box7" type="string">

-		Chat Bobler:

-	</text>

-	<check_box label="Vis chat bobler" name="bubble_text_chat"/>

-	<slider label="Opacitet" name="bubble_chat_opacity"/>

+	<spinner left="350" name="max_chat_count"/>

+	<text type="string" length="1" name="text_box5" left="415">

+		(linier)

+	</text>

+	<slider label="Gennemsigtighed" name="console_opacity" />

+	<check_box label="Brug fuldskærms bredde  (Kræver genstart)"

+	     name="chat_full_width_check" />

+	<text type="string" length="1" name="text_box6">

+		Chat indstillinger:

+	</text>

+	<check_box label="Luk chat efter tryk på enter" name="close_chat_on_return_check" />

+	<check_box label="Piletaster flytter altid figur under chat"

+	     name="arrow_keys_move_avatar_check" />

+	<check_box label="Vis klokkeslæt i lokal chat" name="show_timestamps_check" />

+	<check_box label="Afspil skrive animation ved chat" name="play_typing_animation" />

+	<text type="string" length="1" name="text_box7">

+		Chat talebobler:

+	</text>

+	<check_box label="Vis chat bobler" name="bubble_text_chat" />

+	<slider label="Gennemsigtighed" name="bubble_chat_opacity" />

 </panel>