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, 51 insertions, 0 deletions

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

+<panel label="Debug" name="Debug">

+	<text name="region_text_lbl">

+		Region:

+	</text>

+	<text name="region_text">

+		ukendt

+	</text>

+	<check_box label="Deaktivér scripts" name="disable_scripts_check"

+	     tool_tip="Deaktivér alle scripts i denne region" />

+	<button label="?" name="disable_scripts_help" />

+	<check_box label="Deaktivér kollisioner" name="disable_collisions_check"

+	     tool_tip="Deaktivér kollisioner mellem objekter i denne region" />

+	<button label="?" name="disable_collisions_help" />

+	<check_box label="Deaktivér fysik" name="disable_physics_check"

+	     tool_tip="Deaktivér alt fysik i denne region" />

+	<button label="?" name="disable_physics_help" />

+	<button label="Gem" name="apply_btn" />

+	<text name="objret_text_lbl">

+		Returnér objekter

+	</text>

+	<text name="resident_text_lbl">

+		Beboer:

+	</text>

+	<line_editor name="target_avatar_name">

+		(ingen)

+	</line_editor>

+	<button label="Vælg..." name="choose_avatar_btn" />

+	<text name="options_text_lbl">

+		Valg:

+	</text>

+	<check_box label="Returnér kun objekter med script" name="return_scripts"

+	     tool_tip="Returnér kun objekter med scripts." />

+	<check_box label="Returnér kun objekter på andre brugeres land" name="return_other_land"

+	     tool_tip="returnér kun objekter på land som tilhører andre" />

+	<check_box label="Returnér objekter fra alle regioner i denne estate"

+	     name="return_estate_wide"

+	     tool_tip="Returnér objekter i alle regioner der tilhører denne estate" />

+	<button label="Returnér" name="return_btn" />

+	<button label="Mest kolliderende..." name="top_colliders_btn"

+	     tool_tip="Liste med de objekter der oplever flest kollissioner" />

+	<button label="?" name="top_colliders_help" />

+	<button label="Mest krævende scripts..." name="top_scripts_btn"

+	     tool_tip="Liste med de objekter der kræver mest script tid" />

+	<button label="?" name="top_scripts_help" />

+	<button label="Genstart region" name="restart_btn"

+	     tool_tip="Genstart region om 2 minutter (sender advarsel først)" />

+	<button label="?" name="restart_help" />

+	<button label="Udskyd genstart" name="cancel_restart_btn"

+	     tool_tip="Udsæt genstart med en time" />

+</panel>