summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2012-02-06Automated merge with http://hg.secondlife.com/viewer-developmentRichard Linden
2012-02-06STORM-1793 Fix dumb syntax errorJonathan Yap
2012-02-06EXP-1849 FIXED Privacy settings could be set to default when modifying other ↵Vadim ProductEngine
preferences before login.
2012-02-06merge changes for storm-1718Oz Linden
2012-02-06merge changes for storm-1804Oz Linden
2012-02-06merge changes for storm-1793Oz Linden
2012-02-06merge changes for storm-1795Oz Linden
2012-02-06merge changes for storm-1803Oz Linden
2012-02-06merge changes for storm-1741Oz Linden
2012-02-06SH-2794, resolved merge conflict and corrected logic in ↵Leslie Linden
LLVertexBuffer::determineUsage() to work the way it used to.
2012-02-06merge, conflicts in llvertexbuffer.{h,cpp}Brad Payne (Vir Linden)
2012-02-06increment viewer version to 3.3.0Oz Linden
2012-02-03made hardware settings floater dependent on preferences floaterRichard Linden
2012-02-03Automated merge with ssh://hg.lindenlab.com/richard/viewer-experienceRichard Linden
2012-02-03EXP-1513 FIX Underscore ( _ ) fails to show in first chat entry in Local ChatRichard Linden
EXP-1854 FIX Text positioning in mini inspector a couple pixels too low
2012-02-03merge changes for vmrg-222Oz Linden
2012-02-03EXP-1853 FIX Misspelled value in llbvhloader.cppcallum
2012-02-03EXP-1845 FIX Media controls cannot be selected or set in Build tools texture tabcallum
2012-02-03EXP-1868 FIX Remove Merchant Outbox from Me menuRichard Linden
removed merchant outbox context menu reviewed by Leslie
2012-02-03EXP-1868 FIX Remove Merchant Outbox from Me menuRichard Linden
reviewed by Leslie
2012-02-03Automated merge with http://hg.secondlife.com/viewer-developmentNat Goodspeed
2012-02-03Escape all strings embedded in TeamCity service messages.Nat Goodspeed
TeamCity requires that certain characters (notably "'") must be escaped when embedded in service messages: http://confluence.jetbrains.net/display/TCD65/Build+Script+Interaction+with+TeamCity#BuildScriptInteractionwithTeamCity-ServiceMessages TUT frequently outputs messages containing "'", e.g. from ensure_equals() failure. We've seen TC output nesting get confused when it fails to process service messages properly due to parsing unescaped messages. Along with test<n> number, report test name (from set_test_name()) when available. Eliminate horsing around to produce normal output on both std::cout and possible output file. When output file is specified, use boost::iostreams::tee_device to do fanout for us. Improve placement (and possibly reliability) of service messages. Clean up a startling amount of redundancy in service-message production.
2012-02-03STORM-1793 Fix another logic error in getAvatarsJonathan Yap
2012-02-03STORM-1793 Fix bad assumption in getAvatarsJonathan Yap
2012-02-03EXP-1843 WIP Added an option to output avatar rez timing.Vadim ProductEngine
Use the new "Avatar Rez" debugging tag to see the output.
2012-02-03EXP-1840 FIXED (When two inventory windows are open and "properties" are ↵Paul ProductEngine
viewed, one window suddenly moves in front of the other window) - Modified method LLFloaterSidePanelContainer::openChildPanel so that it doesn't open floater each time it's called. Otherwise each time opening child panel of already opened floater, openFloater() will reposition the floater.
2012-02-03EXP-1819 FIXED (Location & Favorites bar splitter should be draggable to 200 ↵Paul ProductEngine
px on left and 150 px on right. ) - Allowed dragging to the left to shrink location to no less than 310 pixels, and to the right to shrink favorites to 185 pixels
2012-02-02EXP-1856 FIX -- Calling cards, library items, 'no transfer' objects can be ↵Leslie Linden
copied to Merchant outbox via ctrl-v * Viewer now applies the same logic as inventory drag and drop to clipboard paste operations.
2012-02-02Automated merge with ↵Richard Linden
bundle:E:\code\viewer-experience+c:\users\richard\appdata\local\temp\thg.trckmy\ssh__richard@hg.lindenlab.com_richard_viewer-experience_ywvwfc.hg
2012-02-02EXP-1858 FIX Received Items panel heading in incorrect positionRichard Linden
didn't account properly for collapsed panels
2012-02-02Removing a call to llround() per Richard.Vadim ProductEngine
2012-02-02Restoring a call to llround() in lllineeditor.cpp mistakenly removed in ↵Vadim ProductEngine
changeset 0a9ef58e8f7d. By the way, removing a pointless call to llround() in lldraghandle.cpp.
2012-02-01Automated merge with ssh://hg.lindenlab.com/richard/viewer-experienceRichard Linden
2012-02-01cleaned up linden_common.h, removing stuff that is mostly unusedRichard Linden
2012-02-01EXP-1672 FIXED Various fixes to prevent crashes in notifications.Seth ProductEngine
- Refactoring of LLToast and LLScreenChannel classes: moved LLToast signals to the private section. - Modified the screen channel's lists of toasts to store LLHandles instead of pointers and screen channel code to work with toast LLHandles.
2012-02-01converted a bunch of narrowing implicit conversions to explicitRichard Linden
2012-02-01mergeBrad Payne (Vir Linden)
2012-02-01EXP-1822 FIXED (After deleting an item from inventory and confirming "ok" to ↵Paul ProductEngine
delete, focus leaves inventory) -Return focus to the previously focused view
2012-02-01fixed Linux buildPaul ProductEngine
2012-01-31fixed layout_stack regression resulting in side toolbars being truncatedRichard Linden
2012-01-31EXP-1513 FIX Underscore ( _ ) fails to show in first chat entry in Local ChatRichard Linden
2012-01-31Fixed up LLVolume memory leak caused by mesh repo thread.Leslie Linden
Reviewed by Bao.
2012-01-31Automated merge with ssh://hg.lindenlab.com/richard/viewer-experienceRichard Linden
2012-01-31 EXP-1851 FIX Crash when trying to resize the bottom sectionsRichard Linden
more layout logic fixes and added renormalization to fractional sizes to eliminate drift
2012-01-31STORM-1803 Adjust messages in notifications.xmlJonathan Yap
2012-01-31STORM-1741 Collection of color and skinning issuesHitomi Tiponi
With help from Jonathan Yap
2012-01-31SH-2592 FIX -- (OS X Lion) Graphics issues with Atmospheric Shaders enabled ↵Leslie Linden
on Intel HD 3000, 10.7.2 This is a dummy check-in to get the previous commit associated with SH-2592 instead of EXP-2592, which was a typo.
2012-01-31EXP-1819 FIXED (Location & Favorites bar splitter should be draggable to ~75%)Paul ProductEngine
- Made splitter draggable to ~75% - Decreased min width of navigation layout panel for user convenience, so that user can make favorites bar bigger and see more favorite landmarks at a time.
2012-01-30 EXP-1851 WIP Crash when trying to resize the bottom sectionsRichard Linden
fixed layout logic when dealing with invisibile layout_panels
2012-01-30EXP-2592 FIX -- (OS X Lion) Graphics issues with Atmospheric Shaders enabled ↵Leslie Linden
on Intel HD 3000, 10.7.2 * Fixed up shaders to add haze_density and blue_density together correctly as vec4's rather than relying on the shader compiler to add them together properly.