summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2010-08-17mergeTofu Linden
2010-08-17CT-575 PL linguisticEli Linden
2010-08-17CT-575 WIP Polish global translation editEli Linden
2010-08-17Merge from default branchVadim Savchuk
--HG-- branch : product-engine
2010-08-16EXT-8636 FIXED updating wearables (worn) prefix in 'My Outfits' list.Sergei Litovchuk
- Fixed LLOutfitsList COF changes handler to update worn status of items removed from COF. Now they are updated based on the differences in original items' ids in COF. - Fixed 'My Outfits' items worn status check to update depending on whether the item is linked in COF or not. This is a kind of workaround to fix updating attachments' worn status because LLAppearanceMgr::updateAppearanceFromCOF is triggered erlier than new attachment links are fetched. When dumpItemArray(obj_items,"asset_dump: obj_item") is called from LLAppearanceMgr::updateAppearanceFromCOF, all attachment links have empty asset ids. Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/859/. --HG-- branch : product-engine
2010-08-16EXT-8370 FIX en_xui_change resizing for IT truncationEli Linden
2010-08-16CT-575 FR linguisticEli Linden
2010-08-16Merge from default branchVadim Savchuk
--HG-- branch : product-engine
2010-08-13mergeBrad Payne (Vir Linden)
2010-08-13DEV-52580 FIXBrad Payne (Vir Linden)
2010-08-13EXT-8650 Can wear multiple copies of no-copy item via object linksLoren Shih
* EXT-8661 Take out unused mRegisteredAttachments in LLAppearanceMgr Removed unused mRegisteredAttachments. Not sure what this was used for, but it's no longer used.
2010-08-13EXT-8662 FIXED Crash on renaming incomplete inventory items.Vadim Savchuk
I couldn't reproduce this problem, but from what I've seen in the crash reporter, this is a very old bug affecting viewers 1.2x and 2.x. When user tries to rename an incomplete inventory item, viewer crashes. The fix is to disallow renaming incomplete items. Reviewed by Seraph at https://codereview.productengine.com/secondlife/r/857/ --HG-- branch : product-engine
2010-08-13EXT-8650 Can wear multiple copies of no-copy item via object linksLoren Shih
* EXT-8688 Automatically detach same object is detected * EXT-8689 Cleanup detachAttachmentIntoInventory code When an object arrives as an attachment, if it's already attached then it's automatically detached.
2010-08-13merge from PE's viewer-releaseTofu Linden
2010-08-12Automated merge with ssh://hg.lindenlab.com/q/viewer-releaseXiaohong Bao
2010-08-12Fix for EXT-8578: Blurry image in profile never resolves - texture queue ↵Xiaohong Bao
problem?
2010-08-12DEV-52580 WIP: disallow multiple links to the same attachment in ↵Brad Payne (Vir Linden)
updateAppearanceFromCOF()
2010-08-12EXT-8473 FIXED Fixed renaming inventory items without hitting Enter.Vadim Savchuk
Problem: The bug was caused by the fix of EXT-6682 that prematurely forgets the item being renamed (by resetting mRenameItem) whenever the renamer input field loses focus. That's why we couldn't actually finish renaming item. Fix: The code is quite messy, but I'll try to explain. There are three cases when we should hide the renamer: 1) ESC key is hit (just hide). 2) ENTER key is hit (rename, then hide). 3) renamer loses focus (rename, then hide). In the first two cases we manually remove the renamer from the popups list -- by calling gViewerWindow->removePopup(mRenamer). In the third case that's done automatically. So, in all cases the onRenamerLost() pop-up is called that hides the renamer and only *then* resets mRenameItem. Not only this approach fixes the bug -- I hope it's a bit more straightforward too. Reviewed by Seraph at https://codereview.productengine.com/secondlife/r/854/ --HG-- branch : product-engine
2010-08-12EXT-8629 FIXED Enable the Wear button in My Outfits for outfits that are ↵Vadim Savchuk
subsets of the current outfit. We allowed wearing any outfit that contains non-worn items. Now it appears to be wrong, therefore and I changed condition so that we allow wearing any outfit (or folder) that contains the full set of body parts. Reviewed by Sergey Litovchuk at https://codereview.productengine.com/secondlife/r/855/ --HG-- branch : product-engine
2010-08-12EXT-8589 FIXED Nothing happens if choose 'Invite to Group' from avatar's 3D ↵Tofu Linden
context menu The groups-chooser was auto-closing when the IW selection was lost, which in the case of right-clicking on (other) avatars is immediately. The 'hg blame' is lost in merge-fubarism so I can't track why this behaviour was ever introduced, but I can think or (or find) no reason to autoclose in this case - the groups picker dialog doesn't even use the current selection, let alone care if it's lost.
2010-08-12EXT-8628 FIXED Crash in LLVOAvatarSelf::getAttachedPointName().Sergei Litovchuk
The crash was reproducible only on startup. Apparently, gAgentAvatarp was not valid at that point. Worked around by checking gAgentAvatarp for being valid. I didn't investigate what the root cause of the problem was (probably the new multi-attachments implementation), I just needed my viewer to work. Reviewed by Seraph at https://codereview.productengine.com/secondlife/r/847/. --HG-- branch : product-engine
2010-08-12EXT-8205 FIXED (Items in \"Add more\" panel are not sorted by name)Paul Guslisty
- Modified LLWearableItemTypeNameComparator so that it can be more reusable and adjustable - Set LLWearableItemTypeNameComparator for WearableItemsList ('List view' of 'Add More' panel) due to sort clothings by name - Modified and applied patch form https://codereview.productengine.com/secondlife/r/620/diff/2/#index_header. This patch was discarded because specification was changed Restored diff after bad merge at 13817 Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/765/ --HG-- branch : product-engine
2010-08-11Automated merge with ssh://hg.lindenlab.com/q/viewer-releaseXiaohong Bao
2010-08-11automated mergeLoren Shih
2010-08-12EXT-8599 FIXED (Search Floater - \"loading\" and \"Done\" text in lower left ↵Paul Guslisty
is cut-off) - Added height parameters and removed unnecessary bottom parameter Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/852/ --HG-- branch : product-engine
2010-08-12EXT-7951 FIXED (Mini-Location panel appearance design issues)Paul Guslisty
- Added callback on show\hide Mini Location Panel event. This callback sets proper initial minimized position depending on state (shown or hidded) Mini Location Panel. Also callback shifts vertically already minimized floaters so that they don't overlap Mini Location Panel Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/851/ --HG-- branch : product-engine
2010-08-11EXT-8425 FIXED Translated names of "Home" and "Esc" keys shown in shortcuts.Andrew Dyukov
Each key has KEY (typedef of U8) represantation which is paired with text version of key. To get strings corresponding to keys LLKeyboard::stringFromKey() is used. - Added translation of keys into LLKeyboard::stringFromKey(). - Added corresponding strings into strings.xml. - Changed LLTrans::getKeyboardString() so that it correctly process key names that are not found in strings.xml(returns English name instead of "MissingString"). Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/845/ --HG-- branch : product-engine
2010-08-11merge from viewer-releaseTofu Linden
2010-08-11merge from PE's viewer-trunkTofu Linden
2010-08-11merge from PE's viewer-releaseTofu Linden
2010-08-10EXT-8376 FIX en_xui_change for IT truncation; DE fixEli Linden
2010-08-10MergeEli Linden
2010-08-10EXT-8370 WIP remove old overridesEli Linden
2010-08-10Automated merge with ssh://hg.lindenlab.com/q/viewer-releaseXiaohong Bao
2010-08-10EXT-7399: FIXED: 2.0.2 with http textures loads textures slower than 1.23.5Xiaohong Bao
2010-08-10CT-575 WIP restore PL translation that got lostEli Linden
2010-08-10EXT-8576 FIXED Only attachments are worn if multi-select items on 'My ↵Vadim Savchuk
Outfits' tab and press 'Wear' button. Reason: avatar appearance was not updated if the last selected item was an attachment. Fix: make sure appearance is updated afterwards, regardless of items types. Reviewed by Nyx at https://codereview.productengine.com/secondlife/r/848/ --HG-- branch : product-engine
2010-08-10EXT-8255 FIXED Added confirmation dialog when removing items.Andrew Dyukov
Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/849/ --HG-- branch : product-engine
2010-08-10merge from PE's viewer-trunkTofu Linden
2010-08-10EXT-3981 FIXED changeset e1e225cd1deb. Disabled folder view automatic ↵Sergei Litovchuk
scrolling while background fetch is in progress. Reviewed by Loren Shih at https://codereview.productengine.com/secondlife/r/835/. --HG-- branch : product-engine
2010-08-10Backed out changeset: e1e225cd1debSergei Litovchuk
--HG-- branch : product-engine
2010-08-10Fix for crash when deferred rendering enabled and toggling wireframe.Dave Parks
(transplanted from 3886dff9a2829c7a8957d2cc48742e0678ec06a6)
2010-08-10Merge from default branchVadim Savchuk
--HG-- branch : product-engine
2010-08-10(hairy) merge from viewer-releaseTofu Linden
2010-08-10merge from PE's viewer-trunkTofu Linden
2010-08-09Patch on a fix for the llmediadataclient.cpp unit test.Monroe Linden
My refactor of LLMediaDataClient caused a crash in the windows unit test. Change set 92fd90bd795a fixed the crash, but broke the code in question. This changeset should make the code behave correctly, while removing some premature optimization that I now think didn't properly in the first place.
2010-08-09Automated merge with ssh://hg.lindenlab.com/q/viewer-releaseXiaohong Bao
2010-08-09EXT-8596: FIXED: crash at LLTextureFetchWorker::doWork(int) [secondlife-bin ↵Xiaohong Bao
lltexturefetch.cpp] line 1061
2010-08-09CT-575 WIP PL global edit part 1/2; PL DA set 16 translation for 2.1.1; FR ↵Eli Linden
linguistic
2010-08-09EXT-8628 FIXED Crash in LLVOAvatarSelf::getAttachedPointName().Vadim Savchuk
The crash was reproducible only on startup. Apparently, gAgentAvatarp was not valid at that point. Worked around by checking gAgentAvatarp for being valid. I didn't investigate what the root cause of the problem was (probably the new multi-attachments implementation), I just needed my viewer to work. Reviewed by Seraph at https://codereview.productengine.com/secondlife/r/847/ --HG-- branch : product-engine