summaryrefslogtreecommitdiff
path: root/indra/newview
AgeCommit message (Collapse)Author
2010-08-09Automated merge with ssh://hg.lindenlab.com/dessie/viewer-publicMonroe 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-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-06double click to expand all timers in LLFastTimerViewRichard Nelson
2010-08-06mergeRichard Nelson
2010-08-06fixes for right click fast timer exportRichard Nelson
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-06mergeRichard Nelson
2010-08-06CT-575 WIP FR linguisticEli Linden
2010-08-06speed up population of region scripts listRichard Nelson
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-05mergeRichard Linden
2010-08-05mergeRichard Linden
2010-08-05Allow targeted links in the embedded browser to open multiple media browser ↵Monroe Linden
windows. Added an optional "target" parameter" to LLWeb::loadURL and loadInternal. Made LLViewerMediaImpl::handleMediaEvent pass the target attribute of clicked links through. Set floater_media_browser.xml to allow multiple instances. Added LLFloaterMediaBrowser::create() and made LLFloaterMediaBrowser assume the incoming tag is the window's target, not the URL. Reviewed by Richard at http://codereview.lindenlab.com/2641050
2010-08-05CT-575 WIP IT translation for set16 for Viewer 2.1.1Eli Linden
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-04deprecated ADD_SORTED due to n^2 behavior, set the sort order on the scroll ↵Richard Nelson
list instead
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-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
2010-08-06EXT-8539 FIXED Fixed title of alpha mask not save if renaming it from ↵Andrew Dyukov
'Editing' panel. Bug happened because name change was not explicitly listed as sufficient reason to save a wearable. So saving failed for alpha masks with only names changed. Other wearables didn't have this problem because they passed precondition even if only name was changed thanking to checks that included visualparams. - Made name change explicitly a sufficient reason to proceed with saving a wearable. Reviewed by Neal Orman at https://codereview.productengine.com/secondlife/r/840/ --HG-- branch : product-engine
2010-08-04automated mergeLoren Shih
2010-08-04EXT-8550 DONE Rewrite "You [ACTION] a [RESOLUTION] baked texture for ↵Loren Shih
'[BODYREGION]' after [TIME] seconds." for localization Split this into two messages to take out ACTION as requested.
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-07 06:25:34 +0000