summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2010-05-31Manual merge from default branch.Vadim Savchuk
Semi-automatically resolved conflicts in: * indra/newview/llappearancemgr.cpp * indra/newview/llappviewer.cpp * indra/newview/llcofwearables.cpp * indra/newview/llinventoryfunctions.cpp * indra/newview/llpaneloutfitedit.cpp * indra/newview/skins/default/xui/en/strings.xml * indra/newview/skins/default/xui/ja/strings.xml --HG-- branch : product-engine
2010-05-29EXT-7556 FIXED Update Vivox SDK to 3.1.0001.8821Aimee Linden
2010-05-28automated mergeLoren Shih
2010-05-28automated mergeRoxie Linden
2010-05-28EXT-7504 WIP Force decloud after timeout using lower res texturesLoren Shih
Code cleanup. Some minor changes in logic for when low res texture is used. Added more metrics to notifications and texture debug output.
2010-05-28EXT-7505 FIX stuck in appearance edit mode if close appearance sidebarNyx (Neal Orman)
Added a check for visibility changes that should prevent users from getting "stuck" in appearance editing mode by closing the appearance editor prematurely (clicking sidebar hide, etc). Camera state should be restored when panel is restored. reviewed by Seraph
2010-05-28fix unloaded no-particle avatar sphere to be fullbright, no black flicker. ↵Karl Stiefvater (qarl)
reviewed by Nyx.
2010-05-28EXT-7466 - [BROKEN STRING] the word "administrator" is broken in strings.xml ↵Roxie Linden
in 2 places Simple fix
2010-05-28automated mergeRoxie Linden
2010-05-28automated mergeLoren Shih
2010-05-28Fix for compile error in lltexlayer.cppLoren Shih
2010-05-28ND-46735 WIP FR JA linguisticEli Linden
2010-05-28automated mergeLoren Shih
2010-05-28Fixed linux compile error due to missing forward declare in lltextureview.h.Loren Shih
2010-05-28mergeYuri Chebotarev
--HG-- branch : product-engine
2010-05-28EXT-7013 FIX time formatting function didn't work for some parameters for ↵Yuri Chebotarev
Japanise (like weekdays). reviewed by Vadim Savchuk https://codereview.productengine.com/secondlife/r/457/ --HG-- branch : product-engine
2010-05-28EXT-7472 FIXED Open add to outfit panel by (+) button click on unwearable ↵Paul Guslisty
items and by selecting 'Replace' menu item click body part context menu Main changes: - Added callback for a '(+) button' to the LLCOFCallbacks and bind it with LLPanelOutfitEdit::onAddWearableClicked - Created the callback(LLPanelOutfitEdit::onReplaceBodyPartMenuItemClicked) for 'Replace' menu item of context menu Related changes: - Changed LLFilteredWearableListManager so that it can use different functors (subclasses of LLInventoryCollectFunctor) as a criterion for LLInventoryItemsList filtering. Before it used only LLFindNonLinksByMask filter. Moved LLFindNonLinksByMask from to the llfilteredwearablelist.cpp to the llinventoryfunctions.h - Created getter 'LLPanelDummyClothingListItem::getWearableType()' for LLPanelDummyClothingListItem - Made 'add wearables panel' a member of LLPanelOutfitEdit so that not to use findChild each time panel is needed Reviewed by Igor Borovkov at http://jira.secondlife.com/browse/EXT-7472 --HG-- branch : product-engine
2010-05-28Automated merge with ssh://hg.lindenlab.com/dessie/viewer-publicNyx (Neal Orman)
2010-05-28AVP-44 WIP architectural cleanup for multi-wearablesNyx (Neal Orman)
Implemented some resident-suggested tweaks to better support multiwearables code reviewed by Seraph
2010-05-28automated mergeLoren Shih
2010-05-28CID-442Tofu Linden
Checker: FORWARD_NULL Function: LLBasicCertificateVector::insert(LLCertificateVector::iterator, LLPointer<LLCertificate>) File: /indra/newview/llsechandler_basic.cpp
2010-05-28CID-443Tofu Linden
Checker: FORWARD_NULL Function: LLBasicCertificateVector::BasicIteratorImpl::equals(const LLPointer<LLCertificateVector::iterator_impl> &) const File: /indra/newview/llsechandler_basic.h
2010-05-28CID-448Tofu Linden
Checker: UNINIT_CTOR Function: LLVoiceClient::LLVoiceClient() File: /indra/newview/llvoiceclient.cpp
2010-05-28CID-466Tofu Linden
Checker: NULL_RETURNS Function: LLInventoryItemsList::refresh() File: /indra/newview/llinventoryitemslist.cpp
2010-05-28CID-476Tofu Linden
Checker: NULL_RETURNS Function: LLPanelEditWearable::updateScrollingPanelUI() File: /indra/newview/llpaneleditwearable.cpp
2010-05-28CID-480Tofu Linden
Checker: UNINIT_CTOR Function: LLVivoxVoiceClient::participantState::participantState(const std::basic_string<char, std::char_traits<char>, std::allocator<char>>&) File: /indra/newview/llvoicevivox.cpp
2010-05-28CID-479Tofu Linden
Checker: UNINIT_CTOR Function: LLVivoxVoiceClient::sessionState::sessionState() File: /indra/newview/llvoicevivox.cpp
2010-05-28CID-477Tofu Linden
Checker: NULL_RETURNS Function: LLCOFWearables::buildClothingListItem(LLViewerInventoryItem *, bool, bool) File: /indra/newview/llcofwearables.cpp
2010-05-28CID-478Tofu Linden
Checker: NULL_RETURNS Function: LLCOFWearables::buildBodypartListItem(LLViewerInventoryItem *) File: /indra/newview/llcofwearables.cpp
2010-05-28CID-481Tofu Linden
Checker: FORWARD_NULL Function: LLTaskInvFVBridge::createObjectBridge(LLPanelObjectInventory *, LLInventoryObject *) File: /indra/newview/llpanelobjectinventory.cpp
2010-05-28remove dos line-endings, grr.Tofu Linden
2010-05-28mergeIgor Borovkov
--HG-- branch : product-engine
2010-05-28EXT-7208 PARTIAL FIXED fixed tattoo texture pickers, repositioned tattoo ↵Igor Borovkov
color picker - assigned callbacks for tattoo texture pickers - repositioned tattoo color picker Reviewed by Neal Orman at https://codereview.productengine.com/secondlife/r/453/ --HG-- branch : product-engine
2010-05-28EXT-7341 FIXED updating My Outfits with wearables ordering information on ↵Igor Borovkov
the very first login added saving ordering information for wearables of already populated My Outfits category on the very first login Reviewed by Neal Orman at https://codereview.productengine.com/secondlife/r/455/ --HG-- branch : product-engine
2010-05-28merge from PE's viewer-trunkTofu Linden
2010-05-28Fix build breakRoxie Linden
2010-05-27automated mergeRoxie Linden
2010-05-27automated mergeRoxie Linden
2010-05-27automated mergeRoxie Linden
2010-05-27mergeRichard Linden
2010-05-27VI-49 FIX "_external" links should work in shared mediaRichard Linden
monroe already did most of this, just moved dialog for confirming opening external browser to common code that calls out to external browser so no way to skip notification unless the user opts out
2010-05-27mo' mergin mo problemsPalmer
2010-05-27EXT-7388 - --grid command-line argument does nothingRoxie Linden
Fix up overriding of --loginuri --loginpage --helperuri
2010-05-27mergePalmer
2010-05-27MergeEli Linden
2010-05-27EXT-7504 WIP Force decloud after timeout using lower res texturesLoren Shih
Changed lower res timeout setting to be persistent.
2010-05-27EXT-7504 WIP Force decloud after timeout using lower res texturesLoren Shih
EXT-7526 FIXED Add baked texture information to texture view First attempt at low res textures after timeout. Added debug setting to control whether low res texture timeout is used. Added baked texture load information to texture view debug display. Trivial name changes to some variables.
2010-05-27explicit cast cr:RoxieKaren Lahey
2010-05-27EXT-7332 WIP remove DE overrideEli Linden
2010-05-27mergeBrad Payne (Vir Linden)
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-26 21:39:18 +0000