summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2010-05-26Merge from default branch, resolving conflict in ↵Mike Antipov
indra/newview/llinventorybridge.cpp LLObjectBridge::openItem() was concurrency modified. Applied behavior that was changed in c3220f7f7699 according to VWR-13743 FIXED Change Request: Change double click action for inventory wearables DEV-33391 FIXED Change Request: Change double click action for inventory wearables --HG-- branch : product-engine
2010-05-25mergeRichard Linden
2010-05-25DEV-50015 FIX Implement changes to the Buy L$ button in the top bar of the ↵Richard Linden
viewer
2010-05-25EXT-7487 - Bumping down class of 7000 series nvidia cards.Palmer
2010-05-25MergeCallum Prentice
2010-05-25MergeCallum Prentice
2010-05-25Updated install.xml to point to a version of temporary version LLQtWebKit ↵Callum Prentice
that skips past SSL/Cert errors so QuickBuy functions can be tested. (Windows only) Also tweaked the QuickBuy Currency floater so scrollbars do not appear for current Web content
2010-05-25automated mergeLoren Shih
2010-05-25Fixed compile error in mistakenly-checked-in llvoavatarself.hLoren Shih
2010-05-25MergeEli Linden
2010-05-25EXT-7289 FIX en_xui_changeEli Linden
2010-05-25automated mergeLoren Shih
2010-05-25EXT-7463 FIXED Create instrumentation for tracking COF actions on loginLoren Shih
Removed llinfos that was causing excessive spam.
2010-05-25EXT-7480 Add debuga bility to set texture discard levelsLoren Shih
Added TextureDiscardLevel override for specifying texture discard levels. Aesthetic change to add debug- flag to all avatar debug reporting metrics.
2010-05-25ND-46735 WIP IT JA linguisticEli Linden
2010-05-25fix for llinitparam logic (using wrong scope for static method)Richard Linden
2010-05-25mergeRichard Linden
2010-05-25FIXED EXT-7469 Enabled 'fit to parent' parameter for accordionPaul Guslisty
- Enabled 'fit to parent' parameter for accordion Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/440/ --HG-- branch : product-engine
2010-05-25EXT-6937 PARTIAL FIXED Enable a possibility to "mute everyone" in case group ↵Mike Antipov
chat is already in "moderate_mode" state. Partial fix (until restart moderator's viewer) * store "moderate_mode" session state * if session is already in requested state participants un/mute individually. Known Issue: "moderate_mode" session state is set to false on startup. Thus if moderator join voice chat with disabled voice it has incorrect state. In this case when he sends "Mute everyone" request first time it has effect only to himself. Other unmuted participants are not muted. Next "Mute everyone" request works properly: one request per participant is sent. Reviewed by Aimee Walton at https://codereview.productengine.com/secondlife/r/423/ --HG-- branch : product-engine
2010-05-25EXT-7471 PARTIAL FIXED Ensure bottom tray chatbar can always be resized by user.Mike Antipov
Seems, there is a problem somewhere in rendering of LLLAyoutStack children. Last visible panel marked as user_resize=true can not be resized and has no resize cursor. Because we have no time & resources to investigate this closely a workaround is implemented for bottom tray: * set user_resize for layout panel with Speak button which is always visible to user; * set user_resize=false to don't have Speak button panel resizable. Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/438/ --HG-- branch : product-engine
2010-05-25EXT-7142 FIXED Upload functionality duplicated in the Build menu and Select ↵Andrew Polunin
Linked Parts menu moved up - LLPanelMainInventory::setUploadCostIfNeeded() - uncommented the line which enables retrieving of the upload cost price using LLGlobalEconomy class. - Implemented LLUploadCostCalculator event handler in the llviewermenu.cpp (the fact that it should be implemented in this file was discussed with Mike Antipov). - LLUploadCostCalculator::calculateCost() is implemented only for code readability: it's name is more descriptive than a code snippet placed directly in the constructor (LLPanelMainInventory::setUploadCostIfNeeded() works in similar way: it calculates cost_str only once). - 'Select Linked Parts' menu was moved below 'Edit Linked Parts'. - 'Upload' menu was added at the bottom, below 'Options' menu Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/425/ --HG-- branch : product-engine
2010-05-25VWR-13743 FIXED Change Request: Change double click action for inventory ↵Tofu Linden
wearables DEV-33391 FIXED Change Request: Change double click action for inventory wearables Pulled this from the AvP backlog and implemented it, as it's a pain point from Ben's usability findings. And people loooove this in 3rd party viewers. (transplanted from cd0857d027305aec3dbdfe1940a04f7827e3a656)
2010-05-25EXT-6726 WIP Added handlers for most of Appearance SP context/gear menus.Vadim Savchuk
Reviewed by Mike Antipov and Nyx at https://codereview.productengine.com/secondlife/r/428/ --HG-- branch : product-engine
2010-05-25Fix linux build from llinitparam problem... probably.Tofu Linden
2010-05-24mergeRichard Nelson
2010-05-24DEV-50271 WIP SLURL support for non-clickable namesRichard Nelson
fixed merging logic for blockvalues like rect, uiimage, etc
2010-05-24Automated merge with ssh://hg.lindenlab.com/dessie/viewer-publicNyx (Neal Orman)
2010-05-24AVP-92 FIX Avatar appears to be fat when opening the shape editorNyx (Neal Orman)
Wearable editor previews were affecting the in-world avatar and not properly resetting the changed parameters. Since the "body fat" slider is the last in the default tab for the shape editor, this leaves your avatar fat. Reconfigured the code to work through the wearables and most importantly included a call to updateVisualParameters() at the end of the render function. This appears to have fixed the issue - your avatar does not appear affected during the avatar preview generation anymore. Code reviewed by Seraph
2010-05-24Automated merge with ssh://hg.lindenlab.com/dessie/viewer-publicXiaohong Bao
2010-05-24EXT-7467: FIXED: [DUPLICATED XUI ID] panel_preferences_graphics1.xml has ↵Xiaohong Bao
duplicated string id.
2010-05-24automated mergeLoren Shih
2010-05-24EXT-7463 FIXED Create instrumentation for tracking COF actions on loginLoren Shih
Added more llinfos for tracking COF and InventoryModel changes.
2010-05-24AVP-60 EXT-7366 EXT-7209 WIP Camera views not correct when editing wearableNyx (Neal Orman)
Added code to shift camera focus to appropriate section of the avatar when wearable editor accordion tabs are expanded / collapsed. Known issue: camera does not shift properly when first opening wearable editor. Will implement a selectDefaultSubpart() function later. Code reviewed by Prep
2010-05-24DEV-50271 WIP SLURL support for non-clickable namesRichard Nelson
fixed merging logic for blockvalues like rect, uiimage, etc
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