summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
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-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-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-07merge from PE's viewer-trunkTofu Linden
2010-08-07merge from viewer-releaseTofu Linden
2010-08-07merge from PE's viewer-releaseTofu Linden
2010-08-07merge from viewer-releaseTofu Linden
2010-08-06Fixes for EXT-8563 "VWR-20156: Prim Media on HUDs has no Audio or Interactivity"Monroe Linden
Backed out changeset 1b65d0d42c67 (the fix for EXT-5205), and replaced it with a check in LLPanelPrimMediaControls::nextZoomLevel(). Made LLViewerMediaImpl::calculateInterest() not attempt to calculate distances to HUD attachments, since their global positions are invalid.
2010-08-06EXT-4379 FIXED tab_stop parameter initialization that prevented inventory ↵Sergei Litovchuk
panel from passing focus to folder view's scroll container. Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/823/. --HG-- branch : product-engine
2010-08-06EXT-3981 FIXED Disabled folder view automatic scrolling while background ↵Sergei Litovchuk
fetch is in progress. Reviewed by Loren Shih at https://codereview.productengine.com/secondlife/r/835/. --HG-- branch : product-engine
2010-08-06CT-575 WIP FR linguisticEli Linden
2010-08-06EXT-7963 FIXED (Edit Outfit > Add More > Do not switch to next item type ↵Paul Guslisty
after add/replace) - Added selected item type (in flat list view) as criterion when determining filter type in 'Add More' panel - Fixed LLAccordionCtrl::getSelectedTab() method. When 'selection_enabled = false' for LLAccordionCtrlTab, LLAccordionCtrl::getSelectedTab() returned NULL, even if some accordion tab was selected. Now it's OK. Method returns currently selected LLAccordionCtrlTab. Recovered from bad merge in 13811 Reviewed by Richard Nelson at https://codereview.productengine.com/secondlife/r/790/ --HG-- branch : product-engine
2010-08-06Automated merge with ssh://hg.lindenlab.com/q/viewer-releaseXiaohong Bao
2010-08-06EXT-8447: FIXED: crash at ↵Xiaohong Bao
LLTextureCache::writeEntryToHeaderImmediately(int,LLTextureCache::Entry &,bool) [secondlife-bin lltexturecache.cpp]
2010-08-06merge from viewer-releaseTofu Linden
2010-08-06EXT-8579 FIXED Develop.Avatar.Animation Info should not show asset IDsTofu Linden
Made it so that you only see real UUIDs if the viewer thinks you are in real godmode.
2010-08-06Merge from default branchVadim Savchuk
--HG-- branch : product-engine
2010-08-06merge from viewer-releaseTofu Linden
2010-08-06merge from PE's viewer-releaseTofu Linden
2010-08-05CT-575 WIP IT translation for set16 for Viewer 2.1.1Eli Linden
2010-08-05mergeTofu Linden
2010-08-05mergeTofu Linden
2010-08-05EXT-8304 FIXED [crashhunters] crash in LLKeyframeMotion::deserializeTofu Linden
Speculative bunch of robustification. Reviewed by Soft.
2010-08-05Automated merge with ssh://hg.lindenlab.com/q/viewer-releaseXiaohong Bao
2010-08-05EXT-8309 FIXED Incorrect French date format in place profile and status bar.Vadim Savchuk
Changes: - Added support for formatting day of the month without leading zero ("sday"). - Changed date format in place profile (landmark info) and in the top status bar according to bug reporter's request. Technical details: Actually implementation of strftime() in Linux and Windows supports stripping the leading zero (with "%-d" and "%#d" respectively). But that's not supported in MacOSX, so I had to reimplement it. Reviewed by Sergey Litovchuk at https://codereview.productengine.com/secondlife/r/842/ --HG-- branch : product-engine
2010-08-05EXT-8553 FIXED Substituted "Object Profile" menu item label by "Item ↵Andrew Dyukov
Profile" in My Outfits. Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/836/ --HG-- branch : product-engine
2010-08-05fix a merge conflict I forgot to commit earlier.Tofu Linden
2010-08-05Merge from default branchVadim Savchuk
--HG-- branch : product-engine
2010-08-05(hairy) merge from viewer-releaseTofu Linden
2010-08-05merge from PE's viewer-releaseTofu Linden
2010-08-04merge the fix of SNOW-793: memory leak in LLImageFormatted::appendDataXiaohong Bao
2010-08-04CT-575 WIP FR translation for set16 for Viewer 2.1.1Eli Linden
2010-08-04mergeBrad Payne (Vir Linden)
2010-08-04EXT-8283 FIX, EXT-8360 FIX - original fixes got broken, presumably during ↵Brad Payne (Vir Linden)
some merge
2010-08-04MergeEli Linden
2010-08-04CT-575 WIP PT translation for set16 for Viewer 2.1.1Eli Linden
2010-08-04EXT-7511 FIXED Fixed item selection cropping in Edit OutfitAndrew Dyukov
Restored changeset which was lost after merge 58571b4e704b. Reviewed by Neal Orman at https://codereview.productengine.com/secondlife/r/780/ --HG-- branch : product-engine
2010-08-04Automated merge with ssh://hg.lindenlab.com/q/viewer-releaseXiaohong Bao
2010-08-04Propagate version bump to 2.1.1Christian Goetze (CG)
2010-08-04Propagate version bump to 2.1.1Christian Goetze (CG)
2010-08-04more fix for EXT-7397: decoding textures get stuck in REQ statusXiaohong Bao
2010-08-04Backed out changeset: b81927151a18. Fix of EXT-3981 reverted to fix EXT-4379.Sergei Litovchuk
--HG-- branch : product-engine
2010-08-06Fixed erroneously unrenamed parameter namePaul Guslisty
--HG-- branch : product-engine
2010-08-06EXT-8577 WIP Context menu items for multi-attachments.Vadim Savchuk
Done: - 1. Dropped the obsolete "MultipleAttachments" setting. - 2. Added an "Add" item to the following attachment-related context menus: * My Appearance (ex-My Outfits) context menu. * Edit Outfit -> Add More context menu. * Object in-world context menu. * Inventory context menu. * Object inspector gear menu. - 3. Modified "Attach To / Attach To HUD" to perform the "add" instead of "replace" action. TODO: - Ability to attach multiple objects at once from the Add More panel (bulk attach). - Make 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). Issues: 0. I'm not sure whether LLAgentWearables::userAttachMultipleAttachments() should replace attachments or add them. Assumed the former. 1. I couldn't verify that adding objects from the object inspector menu works because I either could wear an object or see its inspector, not both. 2. > 1. Right-click on an object in your inventory and select "Wear". > VERIFY: Attaches the object and replaces whatever's there; asks for > confirmation before replacing an existing object. I think this is impossible to implement because we don't know in advance what point the object will be attached to, so we can't display a confirmation dialog. Reviewed by Seraph at https://codereview.productengine.com/secondlife/r/843/ --HG-- branch : product-engine
2010-08-06EXT-8207 FIXED (Unexpected camera zoom occures if scroll location history ↵Paul Guslisty
drop-down list by mouse wheel) Added parameter for scroll list control that determines opaque of mouse scroll wheel event. Set this parameter to \"true\" in combobox of navigation panel. Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/829/ --HG-- branch : product-engine
2010-08-06Merge from default branchVadim Savchuk
--HG-- branch : product-engine
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-10 15:07:45 +0000