From 3db9ff8990b82199fe5d3f7034883e5117ffea0d Mon Sep 17 00:00:00 2001 From: Paul Guslisty Date: Wed, 7 Jul 2010 14:37:18 +0300 Subject: EXT-8160 FIXED (remove arrow from shop button) - Replaced the art to the proper Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/700/ --HG-- branch : product-engine --- indra/newview/skins/default/textures/icons/Shop.png | Bin 3104 -> 3052 bytes 1 file changed, 0 insertions(+), 0 deletions(-) (limited to 'indra') diff --git a/indra/newview/skins/default/textures/icons/Shop.png b/indra/newview/skins/default/textures/icons/Shop.png index 9d091fed44..81c13eeabd 100644 Binary files a/indra/newview/skins/default/textures/icons/Shop.png and b/indra/newview/skins/default/textures/icons/Shop.png differ -- cgit v1.2.3 From 9dbc0e2ccebba2ccb7d1fe10dbb62653545daef3 Mon Sep 17 00:00:00 2001 From: Paul Guslisty Date: Wed, 7 Jul 2010 14:48:10 +0300 Subject: EXT-7879 FIXED (Edit Classified has duplicate \"Price for Ad\" and unnecessary help link) - Restored deleted spinner and its label - Added method to show\hide spinner and its label Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/698/ --HG-- branch : product-engine --- indra/newview/llpanelclassified.cpp | 7 ++++++ indra/newview/llpanelclassified.h | 2 ++ .../default/xui/en/floater_publish_classified.xml | 3 ++- .../skins/default/xui/en/panel_edit_classified.xml | 28 ++++++++++++++++++++++ 4 files changed, 39 insertions(+), 1 deletion(-) (limited to 'indra') diff --git a/indra/newview/llpanelclassified.cpp b/indra/newview/llpanelclassified.cpp index 70a7bf644b..7f027d299b 100644 --- a/indra/newview/llpanelclassified.cpp +++ b/indra/newview/llpanelclassified.cpp @@ -1792,6 +1792,7 @@ void LLPanelClassifiedEdit::onOpen(const LLSD& key) enableVerbs(is_new); enableEditing(is_new); + showEditing(!is_new); resetDirty(); setInfoLoaded(false); } @@ -2011,6 +2012,12 @@ void LLPanelClassifiedEdit::enableEditing(bool enable) childSetEnabled("auto_renew", enable); } +void LLPanelClassifiedEdit::showEditing(bool show) +{ + childSetVisible("price_for_listing_label", show); + childSetVisible("price_for_listing", show); +} + std::string LLPanelClassifiedEdit::makeClassifiedName() { std::string name; diff --git a/indra/newview/llpanelclassified.h b/indra/newview/llpanelclassified.h index 1157649a16..eaf652ca06 100644 --- a/indra/newview/llpanelclassified.h +++ b/indra/newview/llpanelclassified.h @@ -416,6 +416,8 @@ protected: void enableEditing(bool enable); + void showEditing(bool show); + std::string makeClassifiedName(); void setPriceForListing(S32 price); diff --git a/indra/newview/skins/default/xui/en/floater_publish_classified.xml b/indra/newview/skins/default/xui/en/floater_publish_classified.xml index f25c170f33..6ce9ed6e77 100644 --- a/indra/newview/skins/default/xui/en/floater_publish_classified.xml +++ b/indra/newview/skins/default/xui/en/floater_publish_classified.xml @@ -25,10 +25,11 @@ Remember, Classified fees are non-refundable. + + Date: Wed, 7 Jul 2010 14:55:19 +0300 Subject: EXT-8149 FIXED (shop button needs a tooltip) - Added tooltips for Shop buttons Reviewed by Vadim Savchuk and Neal Orman at https://codereview.productengine.com/secondlife/r/693/ --HG-- branch : product-engine --- indra/newview/skins/default/xui/en/panel_outfit_edit.xml | 2 ++ 1 file changed, 2 insertions(+) (limited to 'indra') diff --git a/indra/newview/skins/default/xui/en/panel_outfit_edit.xml b/indra/newview/skins/default/xui/en/panel_outfit_edit.xml index adc38b966c..cf174da2f0 100644 --- a/indra/newview/skins/default/xui/en/panel_outfit_edit.xml +++ b/indra/newview/skins/default/xui/en/panel_outfit_edit.xml @@ -406,6 +406,7 @@ It is calculated as border_size + 2*UIResizeBarOverlap left_pad="1" name="shop_btn_1" top="1" + tool_tip="Visit the SL Marketplace. You can also select something you are wearing, then click here to see more things like it" width="31" /> @@ -480,6 +481,7 @@ It is calculated as border_size + 2*UIResizeBarOverlap left_pad="1" name="shop_btn_2" top="1" + tool_tip="Visit the SL Marketplace. You can also select something you are wearing, then click here to see more things like it" width="31" /> -- cgit v1.2.3 From d68b8ce26936b239443b309b797d3d345a560d41 Mon Sep 17 00:00:00 2001 From: Alexei Arabadji Date: Wed, 7 Jul 2010 18:35:14 +0300 Subject: EXT-8154 FIXED Forced removing garbage items from COF. reviewed by Neal Orman at https://codereview.productengine.com/secondlife/r/687/ --HG-- branch : product-engine --- indra/newview/llappearancemgr.cpp | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'indra') diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp index f8cff42412..2c097bdbb1 100644 --- a/indra/newview/llappearancemgr.cpp +++ b/indra/newview/llappearancemgr.cpp @@ -2489,6 +2489,19 @@ void LLAppearanceMgr::removeItemFromAvatar(const LLUUID& id_to_remove) } default: break; } + + // *HACK: Force to remove garbage from COF. + // Unworn links or objects can't be processed by existed removing functionality + // since it is not designed for such cases. As example attachment object can't be removed + // since sever don't sends message _PREHASH_KillObject in that case. + // Also we can't check is link was successfully removed from COF since in case + // deleting attachment link removing performs asynchronously in process_kill_object callback. + LLViewerInventoryItem* item = gInventory.getItem(id_to_remove); + if (item != NULL) + { + gInventory.purgeObject(id_to_remove); + gInventory.notifyObservers(); + } } bool LLAppearanceMgr::moveWearable(LLViewerInventoryItem* item, bool closer_to_body) -- cgit v1.2.3 From 840e33e41e07777473617a0b3320b5a38cba8670 Mon Sep 17 00:00:00 2001 From: Vadim Savchuk Date: Wed, 7 Jul 2010 20:55:35 +0300 Subject: EXT-8168 FIXED Used localized labels when populating 'New Clothes' and 'New Body Parts' submenus of the My Outfits gear menu. Reviewed by Nyx at https://codereview.productengine.com/secondlife/r/708/ --HG-- branch : product-engine --- indra/newview/llpaneloutfitedit.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra') diff --git a/indra/newview/llpaneloutfitedit.cpp b/indra/newview/llpaneloutfitedit.cpp index c397dd5092..2df1982e03 100644 --- a/indra/newview/llpaneloutfitedit.cpp +++ b/indra/newview/llpaneloutfitedit.cpp @@ -196,7 +196,7 @@ private: LLMenuItemCallGL::Params p; p.name = type_name; - p.label = LLWearableType::getTypeDefaultNewName(type); + p.label = LLTrans::getString(LLWearableType::getTypeDefaultNewName(type)); p.on_click.function_name = "Wearable.Create"; p.on_click.parameter = LLSD(type_name); -- cgit v1.2.3 From 4132632cbe6f8755db469c55d1a598b74cadefd8 Mon Sep 17 00:00:00 2001 From: Vadim Savchuk Date: Wed, 7 Jul 2010 21:02:05 +0300 Subject: EXT-8254 FIXED Enabled texture/color selection when editing non-copyable clothing items. Reviewed by Nyx at https://codereview.productengine.com/secondlife/r/707/ --HG-- branch : product-engine --- indra/newview/llpaneleditwearable.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'indra') diff --git a/indra/newview/llpaneleditwearable.cpp b/indra/newview/llpaneleditwearable.cpp index 26f0b3f48f..14f05bdb17 100644 --- a/indra/newview/llpaneleditwearable.cpp +++ b/indra/newview/llpaneleditwearable.cpp @@ -963,8 +963,7 @@ void LLPanelEditWearable::updatePanelPickerControls(LLWearableType::EType type) for_each_picker_ctrl_entry (panel, type, boost::bind(update_color_swatch_ctrl, this, _1, _2)); for_each_picker_ctrl_entry (panel, type, boost::bind(update_texture_ctrl, this, _1, _2)); } - - if (!is_modifiable || !is_copyable) + else { // Disable controls for_each_picker_ctrl_entry (panel, type, boost::bind(set_enabled_color_swatch_ctrl, false, _1, _2)); -- cgit v1.2.3 From 07406b839789e8f72b9dd0321942aa458c922589 Mon Sep 17 00:00:00 2001 From: Vadim Savchuk Date: Wed, 7 Jul 2010 21:18:32 +0300 Subject: EXT-8208 FIXED Hide pop-ups on entering mouse-look mode. Reviewed by Sergey Litovchuk at https://codereview.productengine.com/secondlife/r/706/ --HG-- branch : product-engine --- indra/newview/llagentcamera.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'indra') diff --git a/indra/newview/llagentcamera.cpp b/indra/newview/llagentcamera.cpp index c70bbb985f..1ef9e34f87 100644 --- a/indra/newview/llagentcamera.cpp +++ b/indra/newview/llagentcamera.cpp @@ -2065,6 +2065,7 @@ void LLAgentCamera::changeCameraToMouselook(BOOL animate) // Menus should not remain open on switching to mouselook... LLMenuGL::sMenuContainer->hideMenus(); + LLUI::clearPopups(); // unpause avatar animation gAgent.unpauseAnimation(); -- cgit v1.2.3 From e595ea43be6745b2d1cf8b258d87548b7a19c2e7 Mon Sep 17 00:00:00 2001 From: Vadim Savchuk Date: Wed, 7 Jul 2010 21:27:04 +0300 Subject: EXT-8170 FIXED Fixed clothing context menu localization in Edit Outfit. - Localized the "New Shoes" string. I'm sceptical about this fix. Let's see if the translation team accepts it. If not, I'll add a bunch of new translatable strings like "Create new shoes", "Create new pants", etc. - Translated the "Replace" item of clothing context menu (took translation from the body part context menu). Reviewed by Nyx at https://codereview.productengine.com/secondlife/r/710/ --HG-- branch : product-engine --- indra/newview/llcofwearables.cpp | 2 +- indra/newview/skins/default/xui/de/menu_cof_clothing.xml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'indra') diff --git a/indra/newview/llcofwearables.cpp b/indra/newview/llcofwearables.cpp index d83706de52..8fdbdd08bf 100644 --- a/indra/newview/llcofwearables.cpp +++ b/indra/newview/llcofwearables.cpp @@ -80,7 +80,7 @@ protected: // Set proper label for the "Create new " menu item. LLStringUtil::format_map_t args; - args["[WEARABLE_TYPE]"] = LLWearableType::getTypeDefaultNewName(w_type); + args["[WEARABLE_TYPE]"] = LLTrans::getString(LLWearableType::getTypeDefaultNewName(w_type)); std::string new_label = LLTrans::getString("CreateNewWearable", args); menu_item->setLabel(new_label); } diff --git a/indra/newview/skins/default/xui/de/menu_cof_clothing.xml b/indra/newview/skins/default/xui/de/menu_cof_clothing.xml index 5cf31791ba..7fced273a7 100644 --- a/indra/newview/skins/default/xui/de/menu_cof_clothing.xml +++ b/indra/newview/skins/default/xui/de/menu_cof_clothing.xml @@ -1,6 +1,7 @@ + -- cgit v1.2.3 From 23730070aa5c6a093cb232f4f3f1646cd8a4c9c4 Mon Sep 17 00:00:00 2001 From: Dave Parks Date: Wed, 7 Jul 2010 16:41:04 -0500 Subject: EXT-8102 Modify feature table to default RenderUseStreamVBO to off for ATI cards. --- indra/newview/featuretable.txt | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'indra') diff --git a/indra/newview/featuretable.txt b/indra/newview/featuretable.txt index 1c763453dc..ccdb109d95 100644 --- a/indra/newview/featuretable.txt +++ b/indra/newview/featuretable.txt @@ -1,4 +1,4 @@ -version 21 +version 22 // NOTE: This is mostly identical to featuretable_mac.txt with a few differences // Should be combined into one table @@ -59,6 +59,7 @@ RenderTextureMemoryMultiple 1 1.0 RenderShaderLightingMaxLevel 1 3 SkyUseClassicClouds 1 1 WatchdogDisabled 1 1 +RenderUseStreamVBO 1 1 // @@ -431,6 +432,10 @@ list ATIOldDriver RenderAvatarVP 0 0 RenderAvatarCloth 0 0 +// ATI cards generally perform better when not using VBOs for streaming data + +list ATI +RenderUseStreamVBO 1 0 /// Tweaked NVIDIA -- cgit v1.2.3 From fd0347a8a2eeecb3ec2df798e879569e547f2599 Mon Sep 17 00:00:00 2001 From: Xiaohong Bao Date: Wed, 7 Jul 2010 16:18:05 -0600 Subject: adjust debug code for EXT-6792: [crashhunters] Crash on ATI 3200 --- indra/newview/pipeline.cpp | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'indra') diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index 3716a5e9d9..486cafc999 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -2253,7 +2253,6 @@ void LLPipeline::stateSort(LLCamera& camera, LLCullResult &result) } } } - llpushcallstacks ; { LLFastTimer ftm(FTM_STATESORT_DRAWABLE); for (LLCullResult::drawable_list_t::iterator iter = sCull->beginVisibleList(); @@ -2266,15 +2265,12 @@ void LLPipeline::stateSort(LLCamera& camera, LLCullResult &result) } } } - llpushcallstacks ; { LLFastTimer ftm(FTM_CLIENT_COPY); LLVertexBuffer::clientCopy(); } - llpushcallstacks ; - postSort(camera); - llpushcallstacks ; + postSort(camera); } void LLPipeline::stateSort(LLSpatialGroup* group, LLCamera& camera) @@ -2544,6 +2540,7 @@ void LLPipeline::postSort(LLCamera& camera) assertInitialized(); + llpushcallstacks ; //rebuild drawable geometry for (LLCullResult::sg_list_t::iterator i = sCull->beginDrawableGroups(); i != sCull->endDrawableGroups(); ++i) { @@ -2554,7 +2551,7 @@ void LLPipeline::postSort(LLCamera& camera) group->rebuildGeom(); } } - + llpushcallstacks ; //rebuild groups sCull->assertDrawMapsEmpty(); @@ -2574,6 +2571,7 @@ void LLPipeline::postSort(LLCamera& camera) rebuildPriorityGroups(); + llpushcallstacks ; const S32 bin_count = 1024*8; @@ -2675,7 +2673,7 @@ void LLPipeline::postSort(LLCamera& camera) std::sort(sCull->beginAlphaGroups(), sCull->endAlphaGroups(), LLSpatialGroup::CompareDepthGreater()); } - + llpushcallstacks ; // only render if the flag is set. The flag is only set if we are in edit mode or the toggle is set in the menus if (LLFloaterReg::instanceVisible("beacons") && !sShadowRender) { @@ -2723,7 +2721,7 @@ void LLPipeline::postSort(LLCamera& camera) forAllVisibleDrawables(renderSoundHighlights); } } - + llpushcallstacks ; // If managing your telehub, draw beacons at telehub and currently selected spawnpoint. if (LLFloaterTelehub::renderBeacons()) { @@ -2753,6 +2751,7 @@ void LLPipeline::postSort(LLCamera& camera) } //LLSpatialGroup::sNoDelete = FALSE; + llpushcallstacks ; } -- cgit v1.2.3 From 4e499fe9160be490fff7f68fce582bdbdc909068 Mon Sep 17 00:00:00 2001 From: Xiaohong Bao Date: Wed, 7 Jul 2010 23:13:46 -0600 Subject: EXT-8278: FIXED: endlessly loading some tree textures. --- indra/newview/llvotree.cpp | 3 +++ 1 file changed, 3 insertions(+) (limited to 'indra') diff --git a/indra/newview/llvotree.cpp b/indra/newview/llvotree.cpp index eb5b6c6618..5431aec07c 100644 --- a/indra/newview/llvotree.cpp +++ b/indra/newview/llvotree.cpp @@ -313,7 +313,10 @@ U32 LLVOTree::processUpdateMessage(LLMessageSystem *mesgsys, // // Load Species-Specific data // + static const S32 MAX_TREE_TEXTURE_VIRTURE_SIZE_RESET_INTERVAL = 32 ; //frames. mTreeImagep = LLViewerTextureManager::getFetchedTexture(sSpeciesTable[mSpecies]->mTextureID, TRUE, LLViewerTexture::BOOST_NONE, LLViewerTexture::LOD_TEXTURE); + mTreeImagep->setMaxVirtualSizeResetInterval(MAX_TREE_TEXTURE_VIRTURE_SIZE_RESET_INTERVAL); //allow to wait for at most 16 frames to reset virtual size. + mBranchLength = sSpeciesTable[mSpecies]->mBranchLength; mTrunkLength = sSpeciesTable[mSpecies]->mTrunkLength; mLeafScale = sSpeciesTable[mSpecies]->mLeafScale; -- cgit v1.2.3 From 27b3005b788b969005f8b942024aacd29d16a674 Mon Sep 17 00:00:00 2001 From: Alexei Arabadji Date: Thu, 8 Jul 2010 10:48:17 +0300 Subject: EXT-8218 FIXED Fixed crash in LLNotificationsUI::LLScreenChannel::redrawToasts method. Details: Provided resetting hovered toast field in screen channel when toast destroyed along viewer logging out. reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/705/ --HG-- branch : product-engine --- indra/newview/llscreenchannel.cpp | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'indra') diff --git a/indra/newview/llscreenchannel.cpp b/indra/newview/llscreenchannel.cpp index ef89c07c60..40c99edecd 100644 --- a/indra/newview/llscreenchannel.cpp +++ b/indra/newview/llscreenchannel.cpp @@ -297,6 +297,12 @@ void LLScreenChannel::onToastDestroyed(LLToast* toast) { mStoredToastList.erase(it); } + + // if destroyed toast is hovered - reset hovered + if (mHoveredToast == toast) + { + mHoveredToast = NULL; + } } -- cgit v1.2.3