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/da/floater_beacons.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/da/floater_beacons.xml')
| -rw-r--r-- | indra/newview/skins/default/xui/da/floater_beacons.xml | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/indra/newview/skins/default/xui/da/floater_beacons.xml b/indra/newview/skins/default/xui/da/floater_beacons.xml index 4553a71050..a643a7face 100644 --- a/indra/newview/skins/default/xui/da/floater_beacons.xml +++ b/indra/newview/skins/default/xui/da/floater_beacons.xml @@ -1,16 +1,15 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="beacons" title="Lyssøjler">
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="beacons" title="Pejlelys">
<panel name="beacons_panel">
- <check_box label="Kun kodede objekter med "rør"" name="touch_only"/>
- <check_box label="Kodede objekter" name="scripted"/>
- <check_box label="Fysiske objekter" name="physical"/>
- <check_box label="Lyd kilder" name="sounds"/>
- <check_box label="Partikel Kilder" name="particles"/>
- <check_box label="Render Highlights" name="highlights"/>
- <check_box label="Render Lyssøjle" name="beacons"/>
- <text name="beacon_width_label">
- Lyssøjle bredde:
+ <check_box label="Kun scriptede objekter med "rør"" name="touch_only" />
+ <check_box label="Scriptede objekter" name="scripted" />
+ <check_box label="Fysiske objekter" name="physical" />
+ <check_box label="Lyd kilder" name="sounds" />
+ <check_box label="Partikel kilder" name="particles" />
+ <check_box label="Rendér highlights" name="highlights" />
+ <check_box label="Rendér pejlelys" name="beacons" />
+ <text type="string" length="1" name="beacon_width_label">
+ Pejlelys bredde:
</text>
- <slider name="beacon_width"/>
</panel>
</floater>
|