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/floater_post_process.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/floater_post_process.xml')
| -rw-r--r-- | indra/newview/skins/default/xui/nl/floater_post_process.xml | 53 |
1 files changed, 53 insertions, 0 deletions
diff --git a/indra/newview/skins/default/xui/nl/floater_post_process.xml b/indra/newview/skins/default/xui/nl/floater_post_process.xml new file mode 100644 index 0000000000..1b6d857cbc --- /dev/null +++ b/indra/newview/skins/default/xui/nl/floater_post_process.xml @@ -0,0 +1,53 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Post-Process Floater" title="Nabewerkinginstellingen">
+ <tab_container name="Post-Process Tabs">
+ <panel label="Kleurfilter" name="wmiColorFilterPanel">
+ <check_box label="Inschakelen" name="wmiColorFilterToggle"/>
+ <text name="wmiColorFilterBrightnessText">
+ Helderheid
+ </text>
+ <text name="wmiColorFilterSaturationText">
+ Verzadiging
+ </text>
+ <text name="wmiColorFilterContrastText">
+ Contrast
+ </text>
+ <text name="wmiColorFilterBaseText">
+ Contrastbasiskleur
+ </text>
+ <slider label="R" name="wmiColorFilterBaseR"/>
+ <slider label="G" name="wmiColorFilterBaseG"/>
+ <slider label="B" name="wmiColorFilterBaseB"/>
+ <slider label="I" name="wmiColorFilterBaseI"/>
+ </panel>
+ <panel label="Nachtvisie" name="wmiNightVisionPanel">
+ <check_box label="Inschakelen" name="wmiNightVisionToggle"/>
+ <text name="wmiNightVisionBrightMultText">
+ Lichtversterking
+ </text>
+ <text name="wmiNightVisionNoiseSizeText">
+ Ruisgrootte
+ </text>
+ <text name="wmiNightVisionNoiseStrengthText">
+ Ruissterkte
+ </text>
+ </panel>
+ <panel label="Bloom" name="wmiBloomPanel">
+ <check_box label="Inschakelen" name="wmiBloomToggle"/>
+ <text name="wmiBloomExtractText">
+ Lichtsterkte extractie
+ </text>
+ <text name="wmiBloomSizeText">
+ Bloom-grootte
+ </text>
+ <text name="wmiBloomStrengthText">
+ Bloom-sterkte
+ </text>
+ </panel>
+ <panel label="Extra's" name="Extras">
+ <button label="LaadEffect" label_selected="LaadEffect" name="PPLoadEffect"/>
+ <button label="Effect opslaan" label_selected="Effect opslaan" name="PPSaveEffect"/>
+ <line_editor label="Effectnaam" name="PPEffectNameEditor"/>
+ </panel>
+ </tab_container>
+</floater>
|