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

Merge branch 'UICleanup' of git://github.com/Shyotl/SingularityViewer

Browse Source 
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> >&
This commit is contained in:
Lirusaito
2013-05-27 08:09:28 -04:00
parent a10708e9be 20af325e2c
commit 4eae554812
264 changed files with 4787 additions and 4549 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/skins/default/xui/pt/floater_inventory.xml
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="Inventory" title="Inventário">
<search_editor label="Escreva aqui para busca" name="inventory search editor"/>
<filter_editor label="Escreva aqui para busca" name="inventory search editor"/>
<tab_container name="inventory filter tabs">
<inventory_panel label="Todos os Itens" name="All Items"/>
<inventory_panel label="Itens Recentes" name="Recent Items"/>

2
indra/newview/skins/default/xui/pt/floater_texture_ctrl.xml
View File

@@ -13,7 +13,7 @@
<button label="Nenhum" label_selected="Nenhum" name="None"/>
<button label="Branco" label_selected="Branco" name="Blank"/>
<check_box label="Mostrar Pastas" name="show_folders_check"/>
<search_editor label="Clique aqui para buscar" name="inventory search editor"/>
<filter_editor label="Clique aqui para buscar" name="inventory search editor"/>
<check_box label="Aplicar Imediatamente" name="apply_immediate_check"/>
<button label="Cancelar" label_selected="Cancelar" name="Cancel"/>
<button label="Selecionar" label_selected="Selecionar" name="Select"/>

2
indra/newview/skins/default/xui/pt/floater_world_map.xml
View File

@@ -33,7 +33,7 @@
Landmarks
</combo_item>
</combo_box>
<line_editor label="Procurar por nome de região" name="location" tool_tip="Digite o nome de uma Região"/>
<search_editor label="Procurar por nome de região" name="location" tool_tip="Digite o nome de uma Região"/>
<button label="Procurar" name="DoSearch" tool_tip="Procurar por região"/>
<text name="search_label">
Resultados da Procura:

3
indra/newview/skins/default/xui/pt/panel_group_land_money.xml
View File

@@ -7,6 +7,9 @@
<string name="cant_view_group_land_text">
Você não tem permissão para ver as terras pertencentes ao grupo.
</string>
<string name="epmty_view_group_land_text">
Nada consta
</string>
<string name="cant_view_group_accounting_text">
Você não tem permissão para ver as informações sobre as contas do grupo.
</string>

12
indra/newview/skins/default/xui/pt/panel_group_roles.xml
View File

@@ -47,9 +47,7 @@ podem executar essa habilidade.
</panel>
<tab_container height="164" name="roles_tab_container">
<panel height="148" label="Membros" name="members_sub_tab" tool_tip="Membros">
<line_editor bottom="127" name="search_text"/>
<button label="Pesquisar" name="search_button" width="75"/>
<button label="Mostrar todos" name="show_all_button" left_delta="80"/>
<filter_editor bottom="127" name="filter_input"/>
<name_list name="member_list" bottom_delta="-105" height="104" >
<column label="Nome do membro" name="name"/>
<column label="Tarifa doada" name="donated"/>
@@ -62,9 +60,7 @@ podem executar essa habilidade.
</string>
</panel>
<panel height="148" label="Funções" name="roles_sub_tab">
<line_editor bottom="127" name="search_text"/>
<button label="Busca" name="search_button" width="75"/>
<button label="Mostrar todos" name="show_all_button" left_delta="80"/>
<filter_editor bottom="127" name="filter_input"/>
<scroll_list name="role_list" bottom_delta="-104" height="104">
<column label="Nome da função" name="name"/>
<column label="Título" name="title"/>
@@ -82,9 +78,7 @@ permitidas que os membros podem executar. Os membros poderão ter um ou mais fun
</string>
</panel>
<panel height="148" label="Habilidades" name="actions_sub_tab">
<line_editor bottom="127" name="search_text"/>
<button label="Busca" name="search_button" width="75"/>
<button label="Mostrar todos" name="show_all_button" left_delta="80"/>
<filter_editor bottom="127" name="filter_input"/>
<scroll_list bottom_delta="-120" height="118" name="action_list" tool_tip="Selecione uma habilidade para ver mais detalhes."/>
<string name="help_text">
As habilidades permitem que os membros nas funções façam coisas específicas dentro do grupo.