summaryrefslogtreecommitdiff
path: root/indra/newview
AgeCommit message (Collapse)Author
2010-08-13mergeTofu Linden
2010-08-13trivial comment changes while I was in this code.Tofu Linden
2010-08-12Pulled "dessie/viewer-release" into "dessie/viewer-public".Christian Goetze (CG)
2010-08-12Pulled "viewer-hotfix" into "viewer-release".Christian Goetze (CG)
2010-08-12Pulled "viewer-hotfix" into "viewer-release".Christian Goetze (CG)
2010-08-12merge from viewer-releaseTofu Linden
2010-08-12Fix a bunch of typos in new enums, one of which was causing a build failure.Tofu Linden
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-12merge from viewer-releaseTofu Linden
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-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-11Automated merge with ssh://hg.lindenlab.com/q/viewer-releaseXiaohong Bao
2010-08-11Updated viewer patch number & channelDessie Linden
2010-08-11automated mergeLoren Shih
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-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-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
2010-08-09EXT-8577 FIXED Context menu items for multi-attachmentsVadim Savchuk
Changes: * Implemented bulk-add from My Appearance SP. * Made sure there's no memleak when you click Wear/Attach in the in-world object context menu and the callback isn't invoked (because e.g. avatar fails to get close enough to the object). I stated that in comments. Reviewed by Seraph at https://codereview.productengine.com/secondlife/r/844/ --HG-- branch : product-engine
2010-08-09Merge from default branchVadim Savchuk
--HG-- branch : product-engine
2010-08-09mergeTofu Linden
2010-08-09EXT-7593 FIXED Added passing focus to the selected outfit tab when My ↵Sergei Litovchuk
Outfits tab is open. - Removed "tab_stop" from outfit tabs to prevent passing focus to a tab chosen by default from LLUICtrl::focusFirstItem(). Besides the order of passing focus between outfit tabs by pressing "Tab" was undetermined. - Had to remove const from the return of LLAccordionCtrl::getSelectedTab() to use the returned pointer for setting focus. Reviewed by Neal Orman at https://codereview.productengine.com/secondlife/r/846/. --HG-- branch : product-engine
2010-08-09EXT-8010 ADDITIONAL FIX Fixed problems with avatar links underlining.Andrew Dyukov
There were two problems: 1. Underlining broke when avatar's first and second name were on different lines. 2. There was no underline on hover for avatar miniinspector links in plaintext IM. - First problem was caused by calling LLOnHoverChangeableTextSegment::draw() for the same segment twice- for first and second name that were on different lines, while handleHover() was called only once. So handleHover() was called -> text was underlined -> first part of segment was drawn underlined -> its draw set style back to normal -> second part of segment was drawn without underlining. Fixed this by setting style back to normal only when drawing the last part of the segment. - Second problem was caused by unusual way of appending link to text in chat history. Changed it so that LLTextBase::appendText() now receives link not inside style params, but directly. Also added "/inspect" ending to check in LLUrlEntryAgent::underlineOnHoverOnly(). Reviewed by Richard Nelson at https://codereview.productengine.com/secondlife/r/833/ --HG-- branch : product-engine
2010-08-09patching from fixes made in dessie/viewer-releasegabriel lee
2010-08-07merge from PE's viewer-trunkTofu Linden
2010-08-07merge from viewer-releaseTofu Linden
2010-08-07merge from PE's viewer-releaseTofu Linden