diff --git a/indra/llui/llscrolllistctrl.cpp b/indra/llui/llscrolllistctrl.cpp index 20c53ca42..e0c0cb1e0 100644 --- a/indra/llui/llscrolllistctrl.cpp +++ b/indra/llui/llscrolllistctrl.cpp @@ -2545,6 +2545,19 @@ void LLScrollListCtrl::setScrollListParameters(LLXMLNodePtr node) node->getAttributeS32("column_padding", 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 @@ -2579,22 +2592,6 @@ LLView* LLScrollListCtrl::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFac scroll_list->initFromXML(node, parent); 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; S32 index = 0; 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; F32 columnrelwidth = 0.f; - if (child->getAttributeF32("relwidth", columnrelwidth)) - columns[index]["relwidth"] = columnrelwidth; + if (child->getAttributeF32("relative_width", columnrelwidth) + || child->getAttributeF32("relwidth", columnrelwidth)) + columns[index]["relative_width"] = columnrelwidth; BOOL columndynamicwidth = false; if (child->getAttributeBOOL("dynamic_width", columndynamicwidth) diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 3ec2295b5..b283f2973 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -2127,6 +2127,17 @@ This should be as low as possible, but too low may break functionality Value 1 + AppearanceCloseOnEscape + + Comment + When in appearance editing mode, hitting escape will work the same as the close button + Persist + 1 + Type + Boolean + Value + 0 + AppearanceSpecialLighting Comment diff --git a/indra/newview/llfloaterland.cpp b/indra/newview/llfloaterland.cpp index 1911387df..7c5801680 100644 --- a/indra/newview/llfloaterland.cpp +++ b/indra/newview/llfloaterland.cpp @@ -2677,13 +2677,13 @@ void LLPanelLandAccess::refresh_ui() 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(); getChildView("add_allowed")->setEnabled(can_manage_allowed && allowed_list_count < PARCEL_MAX_ACCESS_LIST); BOOL has_selected = (mListAccess && mListAccess->getSelectionInterface()->getFirstSelectedIndex() >= 0); 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(); getChildView("add_banned")->setEnabled(can_manage_banned && banned_list_count < PARCEL_MAX_ACCESS_LIST); has_selected = (mListBanned && mListBanned->getSelectionInterface()->getFirstSelectedIndex() >= 0); diff --git a/indra/newview/llmorphview.cpp b/indra/newview/llmorphview.cpp index bfef31156..aa441c001 100644 --- a/indra/newview/llmorphview.cpp +++ b/indra/newview/llmorphview.cpp @@ -132,6 +132,8 @@ void LLMorphView::setVisible(BOOL visible) } else { + if (LLFloaterCustomize::instanceExists() && gSavedSettings.getBOOL("AppearanceCloseOnEscape")) + LLFloaterCustomize::instance().onClose(false); shutdown(); } } diff --git a/indra/newview/llnamelistctrl.cpp b/indra/newview/llnamelistctrl.cpp index 2cce1f2de..ab2283644 100644 --- a/indra/newview/llnamelistctrl.cpp +++ b/indra/newview/llnamelistctrl.cpp @@ -360,11 +360,23 @@ LLView* LLNameListCtrl::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFacto std::string sortname(columnname); 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; 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")) { diff --git a/indra/newview/llpanelgeneral.cpp b/indra/newview/llpanelgeneral.cpp index bd6f1be43..812cbc80f 100644 --- a/indra/newview/llpanelgeneral.cpp +++ b/indra/newview/llpanelgeneral.cpp @@ -142,13 +142,13 @@ void LLPanelGeneral::apply() LLComboBox* fade_out_combobox = getChild("fade_out_combobox"); gSavedSettings.setS32("RenderName", fade_out_combobox->getCurrentIndex()); - LLComboBox* namesystem_combobox = getChild("namesystem_combobox"); - LLUICtrl* show_resident_checkbox = getChild("show_resident_checkbox"); - if(gSavedSettings.getS32("PhoenixNameSystem")!=namesystem_combobox->getCurrentIndex() || gSavedSettings.getBOOL("LiruShowLastNameResident")!=show_resident_checkbox->getValue().asBoolean()){ - gSavedSettings.setS32("PhoenixNameSystem", namesystem_combobox->getCurrentIndex()); - gSavedSettings.setBOOL("LiruShowLastNameResident", show_resident_checkbox->getValue()); + S32 namesystem_combobox_index = getChild("namesystem_combobox")->getCurrentIndex(); + BOOL show_resident = getChild("show_resident_checkbox")->getValue(); + if(gSavedSettings.getS32("PhoenixNameSystem")!=namesystem_combobox_index || gSavedSettings.getBOOL("LiruShowLastNameResident")!=show_resident){ + gSavedSettings.setS32("PhoenixNameSystem", namesystem_combobox_index); + gSavedSettings.setBOOL("LiruShowLastNameResident", show_resident); 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); LLVOAvatar::invalidateNameTags(); // Remove all clienttags to get them updated diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index 9c6c05ec1..12562379f 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -1368,7 +1368,7 @@ void init_debug_rendering_menu(LLMenuGL* menu) (void*)LLPipeline::RENDER_DEBUG_TEXTURE_PRIORITY)); sub_menu->addChild(new LLMenuItemCheckGL("Avatar Rendering Cost", &LLPipeline::toggleRenderDebug, NULL, &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, &LLPipeline::toggleRenderDebugControl, (void*)LLPipeline::RENDER_DEBUG_TEXTURE_AREA)); @@ -1669,8 +1669,7 @@ void init_server_menu(LLMenuGL* menu) &is_god_customer_service, NULL)); sub->addChild(new LLMenuItemCallGL("Set to Linden Content", &handle_force_parcel_to_content, - &is_god_customer_service, NULL, - 'C', MASK_SHIFT | MASK_ALT | MASK_CONTROL)); + &is_god_customer_service, NULL)); sub->addSeparator(); sub->addChild(new LLMenuItemCallGL("Claim Public Land", &handle_claim_public_land, &is_god_customer_service)); diff --git a/indra/newview/skins/default/xui/es/notifications.xml b/indra/newview/skins/default/xui/es/notifications.xml index d0bab04ca..97368ed39 100644 --- a/indra/newview/skins/default/xui/es/notifications.xml +++ b/indra/newview/skins/default/xui/es/notifications.xml @@ -72,6 +72,44 @@