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/it/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/it/floater_beacons.xml')
| -rw-r--r-- | indra/newview/skins/default/xui/it/floater_beacons.xml | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/indra/newview/skins/default/xui/it/floater_beacons.xml b/indra/newview/skins/default/xui/it/floater_beacons.xml new file mode 100644 index 0000000000..5588d0a0a3 --- /dev/null +++ b/indra/newview/skins/default/xui/it/floater_beacons.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="beacons" title="Segnali luminosi">
+ <panel name="beacons_panel">
+ <check_box label="Oggetti scriptati con solo 'tocca' abilitato" name="touch_only"/>
+ <check_box label="Oggetti scriptati" name="scripted"/>
+ <check_box label="Oggetti fisici" name="physical"/>
+ <check_box label="Sorgenti di suoni" name="sounds"/>
+ <check_box label="Sorgenti di particelle" name="particles"/>
+ <check_box label="Visualizza l'evidenziato" name="highlights"/>
+ <check_box label="Visualizza segnali" name="beacons"/>
+ <text name="beacon_width_label">
+ Ampiezza segnali:
+ </text>
+ </panel>
+</floater>
|