summaryrefslogtreecommitdiff
path: root/indra/newview
AgeCommit message (Collapse)Author
2010-05-24Automated merge with ssh://hg.lindenlab.com/dessie/viewer-publicNyx (Neal Orman)
2010-05-24AVP-91 FIX avatars rebaking on every loginNyx (Neal Orman)
Whitespace change as my last checkin was reviewed and tested to pass. Avatar baked texture hashing now works across logins and uses the correct texture indices. Code reviewed by Vir
2010-05-24MergeEli Linden
2010-05-24ND-46735 WIP IT JA linguisticEli Linden
2010-05-24EXT-7436 FIX pt 2 - added extra check for wearable to prevent log spamNyx (Neal Orman)
Reviewed by Seraph
2010-05-24Automated merge with ssh://hg.lindenlab.com/dessie/viewer-publicNyx (Neal Orman)
2010-05-24AVP-91 WIP Fix baked texture hashingNyx (Neal Orman)
First pass at fixing baked texture hashing - unified the hash code to one function, made sure all messages pass correct texture indices. Initial code review by Vir
2010-05-24Automated merge with ssh://hg.lindenlab.com/dessie/viewer-publicNyx (Neal Orman)
2010-05-24EXT-7436 FIX every other login ruthing.Nyx (Neal Orman)
I think this is related - every time you wear one body part or a single piece of clothing, it would remove all body parts, causing you to regenerate defaults which makes you look like ruth. Simple error in logic, body parts should only be replaced if they are being removed. Code reviewed by Seraph
2010-05-24automated mergeLoren Shih
2010-05-24EXT-7463 FIXED Create instrumentation for tracking COF actions on loginLoren Shih
Added a bunch of llinfos to track various COF link item actions.
2010-05-24EXT-7460 FIXED (VWR-19451) Viewer crashes when opening notifications console.Aimee Linden
EXT-6783 replaced the "History" notifications channel with "Persistent" but llfloaternotificationsconsole.cpp still refers to "History".
2010-05-24merge from PE's viewer-trunkTofu Linden
2010-05-24merge backoutTofu Linden
2010-05-24Backed out changeset 57e00f7d4d4fTofu Linden
(was: EXT-7145: FIXED: make viewer to handle "URL redirect " for http texture.) This was causing osx/linux build failure.
2010-05-21Automated merge with ssh://hg.lindenlab.com/dessie/viewer-publicXiaohong Bao
2010-05-21EXT-7394: FIXED: Trees have more polys at low detail than at high detail.Xiaohong Bao
2010-05-21Fix for EXT-5667 (support window.open() in shared media so google docs will ↵Monroe Linden
work). Moved the processing of clicks on _external and _blank targeted links from LLMediaCtrl to LLViewerMediaImpl. Removed LLMediaCtrl::setOpenInExternalBrowser() since that functionality is available through the use of the _external target attribute in web content. Removed LLMediaCtrl:: setOpenInInternalBrowser() since it was unimplemented and not used. Made the webkit media plugin set llqtwebkit's window open behavior to WOB_SIMULATE_BLANK_HREF_CLICK. This is #ifdefed out on Linux until we get a new Linux build of llqtwebkit.
2010-05-21Fixed Windows line endings that crept inCallum Prentice
2010-05-21VI-65 - Addition of Quick/Eazy Buy Web based floater.Callum Prentice
Switched off by default for now until Web content ready - turn on with Debug Settings - 'QuickBuyCurrency' Reviewed by Sam/Richard
2010-05-21Automated merge with ssh://hg.lindenlab.com/dessie/viewer-publicNyx (Neal Orman)
2010-05-21EXT-7209 EXT-7366 FIX avatar needs to enter "appearance editing" modeNyx (Neal Orman)
Avatar now enters "appearance editing" mode when opening the outfit or wearable editors in the sidepanel. Changed code to ensure we don't accidentally switch out of it and back in when switching from one to the other. Note that this cuts out LLFLoaterCustomize from being built and shown to the user from any UI. The code for this (and related classes) will be removed once we have pulled any code out of it that we still need. The current outfit and wearable editors should be working sufficiently for most purposes. Bugs should be reported to Nyx Linden or the avatar team. Code reviewed by Vir
2010-05-21EXT-7439 FIXED reduce size of avatar textures floaterLoren Shih
Texture elements are now smaller so the floater doesn't consume the entire viewer window space.
2010-05-21EXT-7438 FIXED INFRASTRUCTURE Fix up llwearable.h to use standard C++ coding ↵Loren Shih
methodology Had three different versions of the same function, one which didn't even have an implementation. Collapsed these down to two and use function overloading to have them use the same name.
2010-05-21EXT-6817 FIXED Increased floater widthPaul Guslisty
- Increased floater width Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/435/ --HG-- branch : product-engine
2010-05-21EXT-7284 FIXED Made more space between controls to avoid overlappingPaul Guslisty
- Moved to the right color_swatch - made more vertical and horizontal space for \"Opacity\" and \"UI Size\" Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/416/ --HG-- branch : product-engine
2010-05-21EXT-6658 FIXED Fixed text overflow and truncationPaul Guslisty
- Made more vertical space between radio group and status text to avoid overlapping - Moved by 5 pixels to the left \"checkbox fullbright\" checkbox to avoid trancation - Replaced checkbox's label with TextBox to have ability to apply word_wrap for truncated label Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/430/ --HG-- branch : product-engine
2010-05-21EXT-6555 FIXED Made 'Add to outfits' and 'Edit outfit' panels visually ↵Paul Guslisty
connected to the buttons bar below - Made 'Add to outfits' and 'Edit outfit' panels visually connected to the buttons bar below Reviewed by Mike Antipov and Neal Orman at https://codereview.productengine.com/secondlife/r/416/ --HG-- branch : product-engine
2010-05-21More for EXT-7309: Investigate turning RenderAvatarMaxVisible down to 1 or 2 ↵Xiaohong Bao
on low end hardware. set RenderAvatarMaxVisible to be 3 by default for low-end settings.
2010-05-21Fixed potential crash in LLInventoryItemsList - unsubscribed from callback ↵Sergei Litovchuk
in destructor. Reviewed by Mike Antipov. --HG-- branch : product-engine
2010-05-21Merge from default branchVadim Savchuk
--HG-- branch : product-engine
2010-05-21EXT-7406 FIXED filtering out items of a link type (panel outfit edit, ↵Igor Borovkov
wearable bottom list) Reviewed by Mike Antipov, Vadim Savchuk and Neal Orman --HG-- branch : product-engine
2010-05-21EXT-7331 FIXED added updating the title (panel outfit edit) on ↵Igor Borovkov
replacing/wearing outfit externally (my inventory) Reviewed by Neal Orman and Mike Antipov --HG-- branch : product-engine
2010-05-21MergeMike Antipov
--HG-- branch : product-engine
2010-05-21EXT-6710 FIXED Implemented functionality to give multiselected inventory ↵Mike Antipov
items to several selected avatars in avatar picker: 1. Select items to share 2. Click Share; Resident chooser opens 3. Select residents to share with, click SELECT 4. Selected items are transferred to selected users 5. Pop-up toast confirms transfer Some implementation notes: * Avatar Picker is not closed when give inventory requests are sent (to be enable change selection and offer other items to other avatars) * Select button is enableв if all selected items can be offered. * Disabling of the "Share" menu item in the Inventory context menu is syncronized with check (before sending offer) whether item can be offered at all Reviewed by Richard Nelson at https://codereview.productengine.com/secondlife/r/364/ --HG-- branch : product-engine
2010-05-21EXT-6710 WIP Prepare to implementation - "Give inventory" related ↵Mike Antipov
functionality was moved from the LLToolDragAndDrop to a separate class - LLGiveInventory. To allow give several inventory items to several selected residents I need some functionality encapsulated in LLToolDragAndDrop class out of it. No functionality should be changed. LLToolDragAndDrop was updated to use new LLGiveInventory'methods instead of removed ones. There were moved methods related to: - give inventory item - give inventory category - log into chat Such functionality was moved: - is give acceptable - do inventory give operation - send give inventory request to server - process give inventory for protected items QA Notes: Functionality related to give inventory via drag and drop should be re-tested closely. Reviewed by Richard Nelson at https://codereview.productengine.com/secondlife/r/364/ --HG-- branch : product-engine
2010-05-21merge from PE's viewer-trunkTofu Linden
2010-05-20EXT-7288 WIP IT remove some overridesEli Linden
2010-05-20EXT-7287 FIX IT remove overrideEli Linden
2010-05-20More for EXT-7309: Investigate turning RenderAvatarMaxVisible down to 1 or 2 ↵Xiaohong Bao
on low end hardware. adjust the arrangements of the panel "preferences -> graphics -> Advanced".
2010-05-20MergeXiaohong Bao
2010-05-20EXT-7309: PARTIAL FIXED: Investigate turning RenderAvatarMaxVisible down to ↵Xiaohong Bao
1 or 2 on low end hardware. added a slider in "preferences -> graphics -> Advanced" to change RenderAvatarMaxVisible value.
2010-05-20MergeXiaohong Bao
2010-05-20automated mergeRoxie Linden
2010-05-20EXT-7223 FIXED (Add \"Shop\" Button in bottom of Inventory panel)Andrew Polunin
- Added 'MarketplaceURL' setting in settings.xml to represent URL which points to the Marketplace. - Added member mShopBtn in the class LLSidepanelInventory. - Added handler LLSidepanelInventory::onShopButtonClicked() which handles a click on the 'Shop' button - Added corresponding widget in the sidepanel_inventory.xml Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/408/ --HG-- branch : product-engine
2010-05-20EXT-5666 FIXED Changed clicked attachment color.Sergei Litovchuk
--HG-- branch : product-engine
2010-05-20EXT-7371 FIXED Improved new state handling in p2p Voice channel to process ↵Mike Antipov
session leave event correctly. Reason: * when user leave a p2p voice session himself the session's voice channel is marked as "ignore next leave session event" * but when he re-starts the voice session the channel stays in "ignore next leave session event" state. So, when an other p2p participant ends call this voice channel is not deactivated because of this flag. Fix: reset "ignore next leave session event" flag to FALSE when viewer is joining p2p voice session. Reviewed by Aimee Walton at https://codereview.productengine.com/secondlife/r/418/ --HG-- branch : product-engine
2010-05-20mergeYuri Chebotarev
--HG-- branch : product-engine
2010-05-20ext-7403 fix - reset all data before setting new group idYuri Chebotarev
reviewed by Vadim Savchuk https://codereview.productengine.com/secondlife/r/419/ --HG-- branch : product-engine
2010-05-20EXT-6598 FIX Handle tooltip message for separatorYuri Chebotarev
reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/417/ --HG-- branch : product-engine