diff options
author | Adam Moss <moss@lindenlab.com> | 2009-05-04 17:43:26 +0000 |
---|---|---|
committer | Adam Moss <moss@lindenlab.com> | 2009-05-04 17:43:26 +0000 |
commit | cc92525b0df952659102d2e5adcc4140fea7f371 (patch) | |
tree | ee1a9b63decb3667fb740a8c9b70bcfdbf9a054b /indra/newview/skins/default/xui/nl/panel_region_debug.xml | |
parent | 4bcbf3342284b19ff5fbda5a16a43a8cafb3baad (diff) |
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
Diffstat (limited to 'indra/newview/skins/default/xui/nl/panel_region_debug.xml')
-rw-r--r-- | indra/newview/skins/default/xui/nl/panel_region_debug.xml | 40 |
1 files changed, 40 insertions, 0 deletions
diff --git a/indra/newview/skins/default/xui/nl/panel_region_debug.xml b/indra/newview/skins/default/xui/nl/panel_region_debug.xml new file mode 100644 index 0000000000..daaec12783 --- /dev/null +++ b/indra/newview/skins/default/xui/nl/panel_region_debug.xml @@ -0,0 +1,40 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Debug" name="Debug">
+ <text name="region_text_lbl">
+ Regio:
+ </text>
+ <text name="region_text">
+ onbekend
+ </text>
+ <check_box label="Schakel scripts uit" name="disable_scripts_check" tool_tip="Schakel alle scripts in deze regio uit"/>
+ <button label="?" name="disable_scripts_help"/>
+ <check_box label="Schakel botsingen uit" name="disable_collisions_check" tool_tip="Schakel alle niet-avatar botsingen in deze regio uit"/>
+ <button label="?" name="disable_collisions_help"/>
+ <check_box label="Fysiek uitschakelen" name="disable_physics_check" tool_tip="Alle fysiek in deze regio uitschakelen"/>
+ <button label="?" name="disable_physics_help"/>
+ <button label="Toepassen" name="apply_btn"/>
+ <text name="objret_text_lbl">
+ Object retourneren
+ </text>
+ <text name="resident_text_lbl">
+ Inwoner:
+ </text>
+ <line_editor name="target_avatar_name">
+ (none)
+ </line_editor>
+ <button label="Kies..." name="choose_avatar_btn"/>
+ <text name="options_text_lbl">
+ Opties:
+ </text>
+ <check_box label="Retourneer alleen objecten die scripts bevatten." name="return_scripts" tool_tip="Retourneer alleen objecten met scripts."/>
+ <check_box label="Retourneer alleen die objecten op het land van iemand anders" name="return_other_land" tool_tip="Retourneer alleen objecten die zich op land bevinden dat aan iemand anders toebehoort"/>
+ <check_box label="Retourneer objecten in alle regio's van dit estate" name="return_estate_wide" tool_tip="Retourneer objecten in alle regio's van dit estate"/>
+ <button label="Retourneren" name="return_btn"/>
+ <button label="Toon top botsingen..." name="top_colliders_btn" tool_tip="Lijst met objecten die de meeste mogelijke botsingen ondergaan"/>
+ <button label="?" name="top_colliders_help"/>
+ <button label="Toon top scripts..." name="top_scripts_btn" tool_tip="Lijst met objecten die de meeste tijd besteden met het uitvoeren van scripts"/>
+ <button label="?" name="top_scripts_help"/>
+ <button label="Herstart regio" name="restart_btn" tool_tip="Geef een 2 minuten afteltijd en herstart de regio."/>
+ <button label="?" name="restart_help"/>
+ <button label="Vertraag herstart" name="cancel_restart_btn" tool_tip="Vertraag herstart met een uur"/>
+</panel>
|