Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Sync

Browse Source 
Includes:
MAINT-3541 (crash in std::vector >::reserve)
MAINT-3364 FIXED Call clearSelection() from root_folder
MAINT-3621 FIXED Set name to "Unnamed" if object's name consists of whitespaces.
MAINT-3412 add gpu_table line with distinct Intel Iris Pro OpenGL regex to match new MBP with forced Intel graphics
MAINT-3119 FIXED Return common chars for triggers that matches the prefix.
MAINT-3661 Fix for crash when uploading corrupt .dae file.
MAINT-3671 FIXED Rename title when new tab is added.
MAINT-3465 FIXED Add check mark to selected entry.
BUG-5537 FIX reverting breaking changes to pectorals and belly.
MAINT-535 FIXED The teleport SLAPP is changed to UNTRUSTED_THROTTLE. Confirmation dialog for teleporting via slapp is added.
This commit is contained in:
Inusaito Sayori
2014-07-11 09:31:51 -04:00
parent e7c506c6ec
commit bc8947289b
27 changed files with 237 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
indra/newview/skins/default/xui/de/menu_viewer.xml
View File

@@ -161,11 +161,11 @@
<menu_item_separator label="-----------" name="separator6"/>
<menu label="Umgebungseinstellungen" name="Environment Settings">
<menu_item_call label="Sonnenaufgang" name="Sunrise"/>
<menu_item_call label="Mittag" name="Noon"/>
<menu_item_call label="Sonnenuntergang" name="Sunset"/>
<menu_item_call label="Mitternacht" name="Midnight"/>
<menu_item_call label="Auf Regionsstandard zurücksetzen" name="Revert to Region Default"/>
<menu_item_check label="Sonnenaufgang" name="Sunrise"/>
<menu_item_check label="Mittag" name="Noon"/>
<menu_item_check label="Sonnenuntergang" name="Sunset"/>
<menu_item_check label="Mitternacht" name="Midnight"/>
<menu_item_check label="Auf Regionsstandard zurücksetzen" name="Revert to Region Default"/>
<menu_item_separator label="-----------" name="separator"/>
<menu_item_call label="Umwelt-Editor" name="Environment Editor"/>
<menu_item_call label="Tageszyklus-Editor" name="Day Cycle Editor"/>

25
indra/newview/skins/default/xui/en-us/menu_viewer.xml
View File

@@ -614,31 +614,36 @@
<menu bottom="-554" create_jump_keys="true" drop_shadow="true" enabled="true"
height="117" label="Environment Settings" left="0" mouse_opaque="false"
name="Environment Settings" opaque="true" tear_off="true" width="169">
<menu_item_call bottom="-29" enabled="true" height="19" label="Sunrise" left="0"
<menu_item_check bottom="-29" enabled="true" height="19" label="Sunrise" left="0"
mouse_opaque="true" name="Sunrise" width="169">
<on_click function="World.EnvSettings" userdata="sunrise" />
<on_check function="World.EnableEnvSettings" userdata="sunrise" />
<on_enable function="RLV.EnableIfNot" userdata="setenv"/>
</menu_item_call>
<menu_item_call bottom="-48" enabled="true" height="19" label="Midday" left="0"
</menu_item_check>
<menu_item_check bottom="-48" enabled="true" height="19" label="Midday" left="0"
mouse_opaque="true" name="Noon" shortcut="control|shift|Y" width="169">
<on_click function="World.EnvSettings" userdata="noon" />
<on_check function="World.EnableEnvSettings" userdata="noon" />
<on_enable function="RLV.EnableIfNot" userdata="setenv"/>
</menu_item_call>
<menu_item_call bottom="-67" enabled="true" height="19" label="Sunset" left="0"
</menu_item_check>
<menu_item_check bottom="-67" enabled="true" height="19" label="Sunset" left="0"
mouse_opaque="true" name="Sunset" shortcut="control|shift|N" width="169">
<on_click function="World.EnvSettings" userdata="sunset" />
<on_check function="World.EnableEnvSettings" userdata="sunset" />
<on_enable function="RLV.EnableIfNot" userdata="setenv"/>
</menu_item_call>
<menu_item_call bottom="-86" enabled="true" height="19" label="Midnight" left="0"
</menu_item_check>
<menu_item_check bottom="-86" enabled="true" height="19" label="Midnight" left="0"
mouse_opaque="true" name="Midnight" width="169">
<on_click function="World.EnvSettings" userdata="midnight" />
<on_check function="World.EnableEnvSettings" userdata="midnight" />
<on_enable function="RLV.EnableIfNot" userdata="setenv"/>
</menu_item_call>
<menu_item_call bottom="-105" enabled="false" height="19" label="Revert to Region Default"
</menu_item_check>
<menu_item_check bottom="-105" enabled="false" height="19" label="Revert to Region Default"
left="0" mouse_opaque="true" name="Revert to Region Default" width="169">
<on_click function="World.EnvSettings" userdata="default" />
<on_check function="World.EnableEnvSettings" userdata="region" />
<on_enable function="RLV.EnableIfNot" userdata="setenv"/>
</menu_item_call>
</menu_item_check>
<menu_item_separator bottom="-113" enabled="true" height="8" label="-----------" left="0"
mouse_opaque="true" name="separator" width="169" />
<menu_item_call bottom="-132" enabled="false" height="19" label="Environment Editor" left="0"

12
indra/newview/skins/default/xui/en-us/notifications.xml
View File

@@ -3744,6 +3744,18 @@ Are you sure you want to teleport?
yestext="Teleport"/>
</notification>
<notification
icon="alertmodal.tga"
name="TeleportViaSLAPP"
type="alertmodal">
Are you sure you want to teleport to [LOCATION]?
<usetemplate
ignoretext="Confirm that I want to teleport via SLAPP"
name="okcancelignore"
notext="Cancel"
yestext="Teleport"/>
</notification>
<notification
icon="alert.tga"
label="Message everyone in your Estate"

1
indra/newview/skins/default/xui/en-us/panel_region_general.xml
View File

@@ -31,6 +31,7 @@
left="205" name="terraform_help" width="18" />
<check_box bottom_delta="-20" follows="left|top" height="20" label="Block Fly" left="10"
name="block_fly_check" width="80" />
<check_box bottom_delta="-20" follows="left|top" height="20" label="Block Parcel Fly Over" tool_tip="Extend access checks upwards to prevent flying over a parcel" left="10" name="block_fly_over_check" width="90" />
<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
left="205" name="fly_help" width="18" />
<check_box bottom_delta="-20" follows="left|top" height="20" label="Allow Damage"

10
indra/newview/skins/default/xui/es/menu_viewer.xml
View File

@@ -126,11 +126,11 @@
<menu_item_call label="Comprar Terreno..." name="Buy Land..."/>
<menu_item_call label="Región/Estado..." name="Region/Estate..."/>
<menu label="Configuración del Entorno" name="Environment Settings">
<menu_item_call label="Amanecer" name="Sunrise"/>
<menu_item_call label="Mediodía" name="Noon"/>
<menu_item_call label="Atardecer" name="Sunset"/>
<menu_item_call label="Medianoche" name="Midnight"/>
<menu_item_call label="Volver a los valores de la Región" name="Revert to Region Default"/>
<menu_item_check label="Amanecer" name="Sunrise"/>
<menu_item_check label="Mediodía" name="Noon"/>
<menu_item_check label="Atardecer" name="Sunset"/>
<menu_item_check label="Medianoche" name="Midnight"/>
<menu_item_check label="Volver a los valores de la Región" name="Revert to Region Default"/>
<menu_item_call label="Editor del Entorno" name="Environment Editor"/>
<menu_item_call label="Editor del Ciclo Diario" name="Day Cycle Editor"/>
<menu_item_call label="Efectos de Post-Procesado" name="Post-Processing Effects"/>

10
indra/newview/skins/default/xui/fr/menu_viewer.xml
View File

@@ -148,11 +148,11 @@
<menu_item_call label="Région et domaine" name="Region/Estate..."/>
<menu_item_separator label="-----------" name="separator6"/>
<menu label="Environnement" name="Environment Settings">
<menu_item_call label="Aube" name="Sunrise"/>
<menu_item_call label="Midi" name="Noon"/>
<menu_item_call label="Coucher de soleil" name="Sunset"/>
<menu_item_call label="Minuit" name="Midnight"/>
<menu_item_call label="Revenir aux options par défaut" name="Revert to Region Default"/>
<menu_item_check label="Aube" name="Sunrise"/>
<menu_item_check label="Midi" name="Noon"/>
<menu_item_check label="Coucher de soleil" name="Sunset"/>
<menu_item_check label="Minuit" name="Midnight"/>
<menu_item_check label="Revenir aux options par défaut" name="Revert to Region Default"/>
<menu_item_separator label="-----------" name="separator"/>
<menu_item_call label="Editeur d&apos;environnement" name="Environment Editor"/>
<menu_item_call label="Editeur du jour" name="Day Cycle Editor"/>

10
indra/newview/skins/default/xui/it/menu_viewer.xml
View File

@@ -129,11 +129,11 @@
<menu_item_call label="Regione/Proprietà Immobiliari..." name="Region/Estate..."/>
<menu_item_separator label="-----------" name="separator6"/>
<menu label="Impostazioni dell&apos;ambiente" name="Environment Settings">
<menu_item_call label="Alba" name="Sunrise"/>
<menu_item_call label="Mezzogiorno" name="Noon"/>
<menu_item_call label="Tramonto" name="Sunset"/>
<menu_item_call label="Mezzanotte" name="Midnight"/>
<menu_item_call label="Reimposta al default della regione" name="Revert to Region Default"/>
<menu_item_check label="Alba" name="Sunrise"/>
<menu_item_check label="Mezzogiorno" name="Noon"/>
<menu_item_check label="Tramonto" name="Sunset"/>
<menu_item_check label="Mezzanotte" name="Midnight"/>
<menu_item_check label="Reimposta al default della regione" name="Revert to Region Default"/>
<menu_item_separator label="-----------" name="separator"/>
<menu_item_call label="Editor dell&apos;ambiente" name="Environment Editor"/>
</menu>

10
indra/newview/skins/default/xui/pt/menu_viewer.xml
View File

@@ -103,11 +103,11 @@
<menu_item_call label="Comprar terreno..." name="Buy Land..."/>
<menu_item_call label="Região/Propriedade..." name="Region/Estate..."/>
<menu label="Configurações de ambiente" name="Environment Settings">
<menu_item_call label="Amanhecer" name="Sunrise"/>
<menu_item_call label="Meio-dia" name="Noon"/>
<menu_item_call label="Pôr-do-Sol" name="Sunset"/>
<menu_item_call label="Meia-noite" name="Midnight"/>
<menu_item_call label="Reverter ao padrão da região" name="Revert to Region Default"/>
<menu_item_check label="Amanhecer" name="Sunrise"/>
<menu_item_check label="Meio-dia" name="Noon"/>
<menu_item_check label="Pôr-do-Sol" name="Sunset"/>
<menu_item_check label="Meia-noite" name="Midnight"/>
<menu_item_check label="Reverter ao padrão da região" name="Revert to Region Default"/>
<menu_item_call label="Editor de ambiente" name="Environment Editor"/>
</menu>
</menu>