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_day_cycle_options.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_day_cycle_options.xml')
| -rw-r--r-- | indra/newview/skins/default/xui/it/floater_day_cycle_options.xml | 94 |
1 files changed, 94 insertions, 0 deletions
diff --git a/indra/newview/skins/default/xui/it/floater_day_cycle_options.xml b/indra/newview/skins/default/xui/it/floater_day_cycle_options.xml new file mode 100644 index 0000000000..9b10e8f6a5 --- /dev/null +++ b/indra/newview/skins/default/xui/it/floater_day_cycle_options.xml @@ -0,0 +1,94 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Day Cycle Floater" title="Editor delle ciclo giorno/notte">
+ <tab_container name="Day Cycle Tabs">
+ <panel label="Ciclo giorno/notte" name="Day Cycle">
+ <button label="?" name="WLDayCycleHelp"/>
+ <text name="WL12am">
+ 12
+ </text>
+ <text name="WL3am">
+ 3
+ </text>
+ <text name="WL6am">
+ 6
+ </text>
+ <text name="WL9amHash">
+ 9
+ </text>
+ <text name="WL12pmHash">
+ 24
+ </text>
+ <text name="WL3pm">
+ 15
+ </text>
+ <text name="WL6pm">
+ 18
+ </text>
+ <text name="WL9pm">
+ 21
+ </text>
+ <text name="WL12am2">
+ 12
+ </text>
+ <text name="WL12amHash">
+ |
+ </text>
+ <text name="WL3amHash">
+ I
+ </text>
+ <text name="WL6amHash">
+ |
+ </text>
+ <text name="WL9amHash2">
+ I
+ </text>
+ <text name="WL12pmHash2">
+ |
+ </text>
+ <text name="WL3pmHash">
+ I
+ </text>
+ <text name="WL6pmHash">
+ |
+ </text>
+ <text name="WL9pmHash">
+ I
+ </text>
+ <text name="WL12amHash2">
+ |
+ </text>
+ <button label="Aggiungi voce" label_selected="Aggiungi voce" name="WLAddKey"/>
+ <button label="Cancella voce" label_selected="Cancella voce" name="WLDeleteKey"/>
+ <text name="WLCurKeyFrameText">
+ Impostazioni del fotogramma chiave:
+ </text>
+ <text name="WLCurKeyTimeText">
+ Tempo:
+ </text>
+ <spinner label="Ora" name="WLCurKeyHour"/>
+ <spinner label="Min" name="WLCurKeyMin"/>
+ <text name="WLCurKeyTimeText2">
+ Impostazione chiave:
+ </text>
+ <combo_box label="Programma:" name="WLKeyPresets"/>
+ <text name="DayCycleText">
+ Raggruppa:
+ </text>
+ <combo_box label="5 min" name="WLSnapOptions"/>
+ <text name="DayCycleText2">
+ Lunghezza del ciclo:
+ </text>
+ <spinner label="Ore" name="WLLengthOfDayHour"/>
+ <spinner label="Min" name="WLLengthOfDayMin"/>
+ <spinner label="Sec" name="WLLengthOfDaySec"/>
+ <text name="DayCycleText3">
+ Anteprima:
+ </text>
+ <button label="Avvia" label_selected="Avvia" name="WLAnimSky"/>
+ <button label="Arresta!" label_selected="Arresta" name="WLStopAnimSky"/>
+ <button label="Usa l'ora della proprietà" label_selected="Vai all'ora della proprietà" name="WLUseLindenTime"/>
+ <button label="Salva il test del giorno" label_selected="Salva il test del giorno" name="WLSaveDayCycle"/>
+ <button label="Carica il test del giorno" label_selected="Carica il test del giorno" name="WLLoadDayCycle"/>
+ </panel>
+ </tab_container>
+</floater>
|