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

Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer

Browse Source
This commit is contained in:
Latif Khalifa
2013-07-30 02:10:50 +02:00
parent 74c3903393 87be371042
commit fb3e24cfa3
8 changed files with 91 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
indra/llui/llscrolllistctrl.cpp
View File

@@ -2545,6 +2545,19 @@ void LLScrollListCtrl::setScrollListParameters(LLXMLNodePtr node)
node->getAttributeS32("column_padding", column_padding); node->getAttributeS32("column_padding", column_padding);
setColumnPadding(column_padding); setColumnPadding(column_padding);
} }
if (node->hasAttribute("mouse_wheel_opaque"))
{
node->getAttribute_bool("mouse_wheel_opaque", mMouseWheelOpaque);
}
if (node->hasAttribute("menu_file"))
{
std::string menu_file;
node->getAttributeString("menu_file", menu_file);
mPopupMenu = LLUICtrlFactory::getInstance()->buildMenu(menu_file, LLMenuGL::sMenuContainer);
LLMenuGL::sMenuContainer->addChild(mPopupMenu);
}
} }
// static // static
@@ -2579,22 +2592,6 @@ LLView* LLScrollListCtrl::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFac
scroll_list->initFromXML(node, parent); scroll_list->initFromXML(node, parent);
scroll_list->setSearchColumn(search_column); scroll_list->setSearchColumn(search_column);
BOOL mouse_wheel_opaque = true;
node->getAttributeBOOL("mouse_wheel_opaque", mouse_wheel_opaque);
scroll_list->mMouseWheelOpaque = mouse_wheel_opaque;
std::string tool_tip;
node->getAttributeString("tool_tip", tool_tip);
scroll_list->setToolTip(tool_tip);
std::string menu_file;
if (node->getAttributeString("menu_file", menu_file))
{
LLMenuGL* menu = LLUICtrlFactory::getInstance()->buildMenu(menu_file, LLMenuGL::sMenuContainer);
LLMenuGL::sMenuContainer->addChild(menu);
scroll_list->setContextMenu(menu);
}
LLSD columns; LLSD columns;
S32 index = 0; S32 index = 0;
for (LLXMLNodePtr child = node->getFirstChild(); child.notNull(); child = child->getNextSibling()) for (LLXMLNodePtr child = node->getFirstChild(); child.notNull(); child = child->getNextSibling())
@@ -2634,8 +2631,9 @@ LLView* LLScrollListCtrl::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFac
columns[index]["width"] = columnwidth; columns[index]["width"] = columnwidth;
F32 columnrelwidth = 0.f; F32 columnrelwidth = 0.f;
if (child->getAttributeF32("relwidth", columnrelwidth)) if (child->getAttributeF32("relative_width", columnrelwidth)
columns[index]["relwidth"] = columnrelwidth; || child->getAttributeF32("relwidth", columnrelwidth))
columns[index]["relative_width"] = columnrelwidth;
BOOL columndynamicwidth = false; BOOL columndynamicwidth = false;
if (child->getAttributeBOOL("dynamic_width", columndynamicwidth) if (child->getAttributeBOOL("dynamic_width", columndynamicwidth)

11
indra/newview/app_settings/settings.xml
View File

@@ -2127,6 +2127,17 @@ This should be as low as possible, but too low may break functionality</string>
<key>Value</key> <key>Value</key>
<integer>1</integer> <integer>1</integer>
</map> </map>
<key>AppearanceCloseOnEscape</key>
<map>
<key>Comment</key>
<string>When in appearance editing mode, hitting escape will work the same as the close button</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>AppearanceSpecialLighting</key> <key>AppearanceSpecialLighting</key>
<map> <map>
<key>Comment</key> <key>Comment</key>

4
indra/newview/llfloaterland.cpp
View File

@@ -2677,13 +2677,13 @@ void LLPanelLandAccess::refresh_ui()
getChildView("HoursSpin")->setEnabled(can_manage_allowed); getChildView("HoursSpin")->setEnabled(can_manage_allowed);
} }
} }
getChildView("AccessList")->setEnabled(can_manage_allowed); getChildView("AccessList")->setEnabled(true/*can_manage_allowed*/);
S32 allowed_list_count = parcel->mAccessList.size(); S32 allowed_list_count = parcel->mAccessList.size();
getChildView("add_allowed")->setEnabled(can_manage_allowed && allowed_list_count < PARCEL_MAX_ACCESS_LIST); getChildView("add_allowed")->setEnabled(can_manage_allowed && allowed_list_count < PARCEL_MAX_ACCESS_LIST);
BOOL has_selected = (mListAccess && mListAccess->getSelectionInterface()->getFirstSelectedIndex() >= 0); BOOL has_selected = (mListAccess && mListAccess->getSelectionInterface()->getFirstSelectedIndex() >= 0);
getChildView("remove_allowed")->setEnabled(can_manage_allowed && has_selected); getChildView("remove_allowed")->setEnabled(can_manage_allowed && has_selected);
getChildView("BannedList")->setEnabled(can_manage_banned); getChildView("BannedList")->setEnabled(true/*can_manage_banned*/);
S32 banned_list_count = parcel->mBanList.size(); S32 banned_list_count = parcel->mBanList.size();
getChildView("add_banned")->setEnabled(can_manage_banned && banned_list_count < PARCEL_MAX_ACCESS_LIST); getChildView("add_banned")->setEnabled(can_manage_banned && banned_list_count < PARCEL_MAX_ACCESS_LIST);
has_selected = (mListBanned && mListBanned->getSelectionInterface()->getFirstSelectedIndex() >= 0); has_selected = (mListBanned && mListBanned->getSelectionInterface()->getFirstSelectedIndex() >= 0);

2
indra/newview/llmorphview.cpp
View File

@@ -132,6 +132,8 @@ void LLMorphView::setVisible(BOOL visible)
} }
else else
{ {
if (LLFloaterCustomize::instanceExists() && gSavedSettings.getBOOL("AppearanceCloseOnEscape"))
LLFloaterCustomize::instance().onClose(false);
shutdown(); shutdown();
} }
} }

16
indra/newview/llnamelistctrl.cpp
View File

@@ -360,11 +360,23 @@ LLView* LLNameListCtrl::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFacto
std::string sortname(columnname); std::string sortname(columnname);
child->getAttributeString("sort", sortname); child->getAttributeString("sort", sortname);
if (child->hasAttribute("relwidth")) if (child->hasAttribute("relative_width"))
{
F32 columnrelwidth = 0.f;
child->getAttributeF32("relative_width", columnrelwidth);
columns[index]["relative_width"] = columnrelwidth;
}
else if (child->hasAttribute("relwidth"))
{ {
F32 columnrelwidth = 0.f; F32 columnrelwidth = 0.f;
child->getAttributeF32("relwidth", columnrelwidth); child->getAttributeF32("relwidth", columnrelwidth);
columns[index]["relwidth"] = columnrelwidth; columns[index]["relative_width"] = columnrelwidth;
}
else if (child->hasAttribute("dynamic_width"))
{
BOOL columndynamicwidth = FALSE;
child->getAttributeBOOL("dynamic_width", columndynamicwidth);
columns[index]["dynamic_width"] = columndynamicwidth;
} }
else if (child->hasAttribute("dynamicwidth")) else if (child->hasAttribute("dynamicwidth"))
{ {

12
indra/newview/llpanelgeneral.cpp
View File

@@ -142,13 +142,13 @@ void LLPanelGeneral::apply()
LLComboBox* fade_out_combobox = getChild<LLComboBox>("fade_out_combobox"); LLComboBox* fade_out_combobox = getChild<LLComboBox>("fade_out_combobox");
gSavedSettings.setS32("RenderName", fade_out_combobox->getCurrentIndex()); gSavedSettings.setS32("RenderName", fade_out_combobox->getCurrentIndex());
LLComboBox* namesystem_combobox = getChild<LLComboBox>("namesystem_combobox"); S32 namesystem_combobox_index = getChild<LLComboBox>("namesystem_combobox")->getCurrentIndex();
LLUICtrl* show_resident_checkbox = getChild<LLUICtrl>("show_resident_checkbox"); BOOL show_resident = getChild<LLUICtrl>("show_resident_checkbox")->getValue();
if(gSavedSettings.getS32("PhoenixNameSystem")!=namesystem_combobox->getCurrentIndex() || gSavedSettings.getBOOL("LiruShowLastNameResident")!=show_resident_checkbox->getValue().asBoolean()){ if(gSavedSettings.getS32("PhoenixNameSystem")!=namesystem_combobox_index || gSavedSettings.getBOOL("LiruShowLastNameResident")!=show_resident){
gSavedSettings.setS32("PhoenixNameSystem", namesystem_combobox->getCurrentIndex()); gSavedSettings.setS32("PhoenixNameSystem", namesystem_combobox_index);
gSavedSettings.setBOOL("LiruShowLastNameResident", show_resident_checkbox->getValue()); gSavedSettings.setBOOL("LiruShowLastNameResident", show_resident);
if(gAgent.getRegion()){ if(gAgent.getRegion()){
if(namesystem_combobox->getCurrentIndex()<=0 || namesystem_combobox->getCurrentIndex()>2) LLAvatarNameCache::setUseDisplayNames(false); if(namesystem_combobox_index<=0 || namesystem_combobox_index>2) LLAvatarNameCache::setUseDisplayNames(false);
else LLAvatarNameCache::setUseDisplayNames(true); else LLAvatarNameCache::setUseDisplayNames(true);
LLVOAvatar::invalidateNameTags(); // Remove all clienttags to get them updated LLVOAvatar::invalidateNameTags(); // Remove all clienttags to get them updated

5
indra/newview/llviewermenu.cpp
View File

@@ -1368,7 +1368,7 @@ void init_debug_rendering_menu(LLMenuGL* menu)
(void*)LLPipeline::RENDER_DEBUG_TEXTURE_PRIORITY)); (void*)LLPipeline::RENDER_DEBUG_TEXTURE_PRIORITY));
sub_menu->addChild(new LLMenuItemCheckGL("Avatar Rendering Cost", &LLPipeline::toggleRenderDebug, NULL, sub_menu->addChild(new LLMenuItemCheckGL("Avatar Rendering Cost", &LLPipeline::toggleRenderDebug, NULL,
&LLPipeline::toggleRenderDebugControl, &LLPipeline::toggleRenderDebugControl,
(void*)LLPipeline::RENDER_DEBUG_SHAME)); (void*)LLPipeline::RENDER_DEBUG_SHAME, 'C', MASK_CONTROL|MASK_ALT|MASK_SHIFT));
sub_menu->addChild(new LLMenuItemCheckGL("Texture Area (sqrt(A))",&LLPipeline::toggleRenderDebug, NULL, sub_menu->addChild(new LLMenuItemCheckGL("Texture Area (sqrt(A))",&LLPipeline::toggleRenderDebug, NULL,
&LLPipeline::toggleRenderDebugControl, &LLPipeline::toggleRenderDebugControl,
(void*)LLPipeline::RENDER_DEBUG_TEXTURE_AREA)); (void*)LLPipeline::RENDER_DEBUG_TEXTURE_AREA));
@@ -1669,8 +1669,7 @@ void init_server_menu(LLMenuGL* menu)
&is_god_customer_service, NULL)); &is_god_customer_service, NULL));
sub->addChild(new LLMenuItemCallGL("Set to Linden Content", sub->addChild(new LLMenuItemCallGL("Set to Linden Content",
&handle_force_parcel_to_content, &handle_force_parcel_to_content,
&is_god_customer_service, NULL, &is_god_customer_service, NULL));
'C', MASK_SHIFT | MASK_ALT | MASK_CONTROL));
sub->addSeparator(); sub->addSeparator();
sub->addChild(new LLMenuItemCallGL("Claim Public Land", sub->addChild(new LLMenuItemCallGL("Claim Public Land",
&handle_claim_public_land, &is_god_customer_service)); &handle_claim_public_land, &is_god_customer_service));

38
indra/newview/skins/default/xui/es/notifications.xml
View File

@@ -72,6 +72,44 @@
<button name="Cancel" text="$canceltext"/> <button name="Cancel" text="$canceltext"/>
</form> </form>
</template> </template>
<notification name="AIXMLExportWriteError">
Fallo de Exportación: no se puede abrir el archivo &quot;[FILE]&quot; para escritura.
</notification>
<notification name="AIXMLImportGridMismatch">
Aviso de Importación: No se pueden aplicar las texturas: El [FILE] fue exportado en el grid &quot;[GRIDNAME]&quot; mientras que el grid actual es &quot;[CURGRID]&quot;.
</notification>
<notification name="AIXMLImportParseError">
Fallo de Importación: no se puede leer o analizar el archivo de vestimenta para importar &quot;[FILE]&quot;.
</notification>
<notification name="AIXMLImportRootTypeError">
Fallo de Importación: el archivo &quot;[FILE]&quot; no es un archivo linden_genepool XML.
</notification>
<notification name="AIXMLImportRootVersionError">
Fallo de Importación: el archivo &quot;[FILE]&quot; contiene datos linden_genepool XML con [TAG] erróneo. Se requiere Versión &quot;[VERSIONMAJOR].0&quot; o inferior.
</notification>
<notification name="AIXMLImportInvalidError">
Fallo de Importación: el archivo &quot;[FILE]&quot; contiene datos inválidos.
</notification>
<notification name="AIXMLImportDifferentGrid">
La importación se ha realizado con exito, pero ten presente que el objeto vestible fue exportado desde el grid [EXPORTGRID] (y el grid actual es [CURRENTGRID]). ¡No se aplicaron las UUIDs de las Texturas!
</notification>
<notification name="AIXMLImportMixedGrid">
La importación se ha realizado con exito, pero ten presente que el objeto vestible fue exportado desde el grid [EXPORTGRID] (y el grid actual es [CURRENTGRID]).¡Se aplicaron las UUIDs de la Texturas pero quizás no existan aquí!
</notification>
<notification name="AIXMLImportWearableTypeMismatch">
Aviso de Importación: el archivo &quot;[FILE]&quot; no contiene un objeto vestible de tipo [TYPE].
Éste contiene un arquetipo de tipo [ARCHETYPENAME]. Por favor, selecciona el tipo correcto antes de comenzar la importación.
</notification>
<notification name="MediaAlert"> <notification name="MediaAlert">
El propietario de esta parcela ha solicitado que el siguiente URL de [TYPE] sea cargado en tu visor: El propietario de esta parcela ha solicitado que el siguiente URL de [TYPE] sea cargado en tu visor: