Conflicts: indra/llappearance/llwearable.h indra/llui/llcombobox.h indra/newview/jcfloaterareasearch.cpp indra/newview/jcfloaterareasearch.h indra/newview/llpanelgrouproles.cpp indra/newview/llpanelgrouproles.h indra/newview/llviewermenu.cpp - Plugged in new MenuFloaterDict for AssetBlacklist and SoundExplorer in menu_viewer.xml and removed the old listeners for them. indra/newview/skins/default/xui/es/floater_inventory.xml Compile Fixes: indra/llcommon/llstl.h - error: expected nested-name-specifier before ‘const’ indra/llui/llmultisliderctrl.cpp:283:12: error: ‘caller’ was not declared in this scope indra/llui/lltexteditor.cpp - error: operands to ?: have different types ‘const LLPointer<LLTextSegment>’ and ‘long int’ - error: passing ‘const LLPointer<LLTextSegment>’ as ‘this’ argument of ‘LLPointer<Type>& LLPointer<Type>::operator=(const LLPointer<Type>&) [with Type = LLTextSegment]’ discards qualifiers indra/newview/llfloaterpermissionsmgr.cpp - Silly Shyotl, boost bind, not std bind. indra/newview/llfloaterproperties.* - error: ‘LLInstanceTracker<LLFloaterProperties, LLUUID>’ is an inaccessible base of ‘LLFloaterProperties’ indra/newview/llgivemoney.cpp - Again, boost::ref, not std::ref indra/newview/llpreviewscript.cpp - no known conversion for argument 1 from ‘std::vector<const LLPointer<LLTextSegment> >’ to ‘std::vector<LLPointer<LLTextSegment> >&
148 lines
5.1 KiB
XML
148 lines
5.1 KiB
XML
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
|
|
<floater name="Inventory" title="Inventario">
|
|
<filter_editor label="Escribe aquí para buscar" name="inventory search editor"/>
|
|
<button label="" name="collapse_btn" tool_tip="Contraer Todo" />
|
|
<button label="" name="Inventory.ExpandAll" tool_tip="Expandir Todo"/>
|
|
<button label="" name="Inventory.ResetAll" tool_tip="Contraer Todo y Limpiar Filtros"/>
|
|
<text name="group_titles_textbox">
|
|
Tipos:
|
|
</text>
|
|
<!-- Inventory Type Filter Labels -->
|
|
<string name="filter_type_all">
|
|
Todos los Tipos
|
|
</string>
|
|
<string name="filter_type_animation">
|
|
Animaciones
|
|
</string>
|
|
<string name="filter_type_callingcard">
|
|
Tarjetas de Llamada
|
|
</string>
|
|
<string name="filter_type_wearable">
|
|
Ropas / Partes de Cuerpo
|
|
</string>
|
|
<string name="filter_type_gesture">
|
|
Gestos
|
|
</string>
|
|
<string name="filter_type_landmark">
|
|
Hitos
|
|
</string>
|
|
<string name="filter_type_notecard">
|
|
Notas
|
|
</string>
|
|
<string name="filter_type_object">
|
|
Objetos
|
|
</string>
|
|
<string name="filter_type_script">
|
|
Scripts
|
|
</string>
|
|
<string name="filter_type_sound">
|
|
Sonidos
|
|
</string>
|
|
<string name="filter_type_texture">
|
|
Texturas
|
|
</string>
|
|
<string name="filter_type_snapshot">
|
|
Fotos
|
|
</string>
|
|
<string name="filter_type_custom">
|
|
Personalizado...
|
|
</string>
|
|
<combo_box name="Quick Filter" tool_tip="Filtro Rápido">
|
|
<combo_item name="filter_type_all">
|
|
Todos los Tipos
|
|
</combo_item>
|
|
<separator />
|
|
<combo_item name="filter_type_animation">
|
|
Animaciones
|
|
</combo_item>
|
|
<combo_item name="filter_type_callingcard">
|
|
Tarjetas de Llamada
|
|
</combo_item>
|
|
<combo_item name="filter_type_wearable">
|
|
Ropas / Partes de Cuerpo
|
|
</combo_item>
|
|
<combo_item name="filter_type_gesture">
|
|
Gestos
|
|
</combo_item>
|
|
<combo_item name="filter_type_landmark">
|
|
Hitos
|
|
</combo_item>
|
|
<combo_item name="filter_type_notecard">
|
|
Notas
|
|
</combo_item>
|
|
<combo_item name="filter_type_object">
|
|
Objetos
|
|
</combo_item>
|
|
<combo_item name="filter_type_script">
|
|
Scripts
|
|
</combo_item>
|
|
<combo_item name="filter_type_sound">
|
|
Sonidos
|
|
</combo_item>
|
|
<combo_item name="filter_type_texture">
|
|
Texturas
|
|
</combo_item>
|
|
<combo_item name="filter_type_snapshot">
|
|
Fotos
|
|
</combo_item>
|
|
<separator />
|
|
<combo_item name="filter_type_custom">
|
|
Personalizado...
|
|
</combo_item>
|
|
</combo_box>
|
|
<tab_container name="inventory filter tabs" >
|
|
<inventory_panel label="Todos los Items" name="All Items"/>
|
|
<inventory_panel label="Items Recientes" name="Recent Items"/>
|
|
<inventory_panel label="Items Vestidos" name="Worn Items"/>
|
|
</tab_container>
|
|
<menu_bar name="Inventory Menu">
|
|
<menu label="Archivo" name="File">
|
|
<menu_item_call label="Abrir" name="Open"/>
|
|
<menu_item_call label="Nueva Ventana" name="New Window"/>
|
|
<menu_item_call label="Mostrar Filtros" name="Show Filters"/>
|
|
<menu_item_call label="Restablecer Filtros" name="Reset Current"/>
|
|
<menu_item_call label="Cerrar todas las Carpetas" name="Close All Folders"/>
|
|
<menu_item_call label="Vaciar la Papelera" name="Empty Trash"/>
|
|
<menu_item_call label="Actualizar Inventario" name="Refresh Inventory"/>
|
|
</menu>
|
|
<menu label="Crear" name="Create">
|
|
<menu_item_call label="Nueva Carpeta" name="New Folder"/>
|
|
<menu_item_call label="Nuevo Script" name="New Script"/>
|
|
<menu_item_call label="Nueva Nota" name="New Note"/>
|
|
<menu_item_call label="Nuevo Gesto" name="New Gesture"/>
|
|
<menu label="Ropas Nuevas" name="New Clothes">
|
|
<menu_item_call label="Nueva Camisa" name="New Shirt"/>
|
|
<menu_item_call label="Nuevos Pantalones" name="New Pants"/>
|
|
<menu_item_call label="Nuevos Zapatos" name="New Shoes"/>
|
|
<menu_item_call label="Nuevas Medias" name="New Socks"/>
|
|
<menu_item_call label="Nueva Chaqueta" name="New Jacket"/>
|
|
<menu_item_call label="Nueva Falda" name="New Skirt"/>
|
|
<menu_item_call label="Nuevos Guantes" name="New Gloves"/>
|
|
<menu_item_call label="Nueva Camiseta" name="New Undershirt"/>
|
|
<menu_item_call label="Nueva Ropa Interior" name="New Underpants"/>
|
|
<menu_item_call label="Nuevo Tatuaje" name="New Tattoo"/>
|
|
<menu_item_call label="Nueva Capa Alfa" name="New Alpha"/>
|
|
<menu_item_call label="Nueva Física" name="New Physics"/>
|
|
</menu>
|
|
<menu label="Partes de Cuerpo Nuevas" name="New Body Parts">
|
|
<menu_item_call label="Nueva Forma" name="New Shape"/>
|
|
<menu_item_call label="Nueva Piel" name="New Skin"/>
|
|
<menu_item_call label="Nuevo Pelo" name="New Hair"/>
|
|
<menu_item_call label="Nuevos Ojos" name="New Eyes"/>
|
|
</menu>
|
|
<menu_item_call label="Nuevo Vestuario" name="New Outfit"/>
|
|
</menu>
|
|
<menu label="Ordenar" name="Sort">
|
|
<menu_item_check label="Por Nombre" name="By Name"/>
|
|
<menu_item_check label="Por Fecha" name="By Date"/>
|
|
<menu_item_check label="Carpetas, siempre por Nombre" name="Folders Always By Name"/>
|
|
<menu_item_check label="Carpetas de Sistema al Principio" name="System Folders To Top"/>
|
|
</menu>
|
|
<menu label="Buscar" name="Search">
|
|
<menu_item_check label="Nombre del Ítem" name="Item name"/>
|
|
<menu_item_check label="Descripción del Ítem" name="Item description"/>
|
|
<menu_item_check label="Creador del Ítem" name="Item creatorr"/>
|
|
</menu>
|
|
</menu_bar>
|
|
</floater>
|