summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2010-12-03Automated merge with https://hg.secondlife.com/mesh-developmentDave Parks
2010-12-03Fix a complaint from gcc about inaccessible base.Dave Parks
2010-12-03#ifdef out ll_align_malloc/free (gcc 4.2 is unhappy about some of the syntax ↵Dave Parks
there)
2010-12-03Update glext.h for 32-bit linux.Dave Parks
2010-12-03mergeDave Parks
2010-12-03Add CameraCoCRatio to make DoF depending on screen resolution.Dave Parks
2010-12-03Automated merge with https://hg.secondlife.com/mesh-developmentDave Parks
2010-12-03Switch default platform SDK to 10.6Dave Parks
2010-12-03Fix for OK notification being overlaid by Keep/Discard/Block notificationJonathan Yap
2010-12-03Apparently the new standard is to NOT suffix ARB extension function pointers ↵Dave Parks
with ARB.
2010-12-03Remove RenderUseFBO from featuretables.Dave Parks
2010-12-02STORM-151 : First shot at compression, not optimzed yetMerov Linden
2010-12-02MergeDave Parks
2010-12-02SH-373 Update glext.h, disable anti-aliasing on ATI when rendering deferred. ↵Dave Parks
Get rid of RenderUseFBO debug setting (only use FBO when rendering deferred). Use GL_ARB_framebuffer_objects instead of GL_EXT_...
2010-12-02SOCIAL-317 FIX LLWebContentFloater opens popups in the media browsercallum
2010-12-02ESC-211 Metrics data sink - fix delivery by viewerMonty Brandenberg
The TextureFetch thread was still stalling out due to a different path that determines whether there is work or not in the thread (uses getPending()) and that had to be harmonized with the changes to runCondition(). I'm not happy with this solution but a refactor of the LLThread tree isn't in the cards right now.
2010-12-02mergeMonroe Linden
2010-12-02SOCIAL-315 FIX Update Qt/LLQtWebKit version number in the viewer to 4.7.1 ↵callum
from 4.6
2010-12-02mergeMonroe Linden
2010-12-02SOCIAL-311 FIX Media browser has too many oddities to be useful for viewer ↵callum
web apps Completes MVP
2010-12-02mergeMonroe Linden
2010-12-02mergeBrad Payne (Vir Linden)
2010-12-02STORM-151 : Remove files we have no use ofMerov Linden
2010-12-02Cleaning up fast timer fixesBrad Payne (Vir Linden)
2010-12-02merge fix for STORM-584Oz Linden
2010-12-02merge fix for STORM-673Oz Linden
2010-12-02merge fix for STORM-718Oz Linden
2010-12-02merge up to latest betaOz Linden
2010-12-02merge fixes for various transparency issuesOz Linden
2010-12-02merge fixes for STORM-432Oz Linden
2010-12-02CHOP-240 Fix for incorrect use of std:multimap iterators. Rev. by Alain.Mark Palange (Mani)
2010-12-02expose update available method.Andrew A. de Laix
2010-12-02merge fix for STORM-679Oz Linden
2010-12-02merge fix for STORM-596Oz Linden
2010-12-02merge fix for STORM-557Oz Linden
2010-12-02Avoiding more RDTSC dependencies in fast timersBrad Payne (Vir Linden)
2010-12-02automated merge up from viewer-developmentLoren Shih
2010-12-02Automated mergeLoren Shih
2010-12-02STORM-718 FIXED Typo in Preferences -> Color.Vadim ProductEngine
Besides, removed redundant space before colon.
2010-12-02STORM-432 ADDITIONAL FIX Disabled manual resizing of the bottom panel in ↵Vadim ProductEngine
the Places SP.
2010-12-02SH-437 Fix for crash when setting RenderGlow to FALSE when deferred ↵Dave Parks
rendering is on.
2010-12-01SOCIAL-311 PARTIAL FIX Media browser has too many oddities to be useful for ↵callum
viewer web apps Added support for graphic browser buttons and laid them out differently
2010-12-01SOCIAL-311 PARTIAL FIX (2) Media browser has too many oddities to be useful ↵callum
for viewer web apps Latest traunch of fixes to new Web only content floater Also removed line in test app that fails to build - have a note to fix later
2010-12-01SOCIAL-231 FIX Enable tooltips (for links and images)Monroe Linden
New build of mac llqtwebkit library from revision 1799a899e06d in http://hg.secondlife.com/llqtwebkit .
2010-12-01OCIAL-231 FIX Enable tooltips (for links and images)Monroe Linden
Added the necessary plumbing to get link_hovered events from the webkit plugin through to the viewer UI. This requires a llqtwebkit library built from revision 1799a899e06d or later in http://hg.secondlife.com/llqtwebkit to function. The viewer source changes are backwards-compatible with earlier versions of llqtwebkit, it just won't see any link_hovered events with previous revisions. Reviewed by Callum.
2010-12-01SOCIAL-249 FIX pressing any of the Alt keys and 0-9 will output the number ↵Monroe Linden
and symbol instead of just symbol The issue seems to be Mac-only, so I've put the fix inside #if LL_DARWIN. Windows' handling of ALT is very different, so the fix might not be appropriate there.
2010-12-01CHOP-238 Fix to bug introduced by ↵Mark Palange (Mani)
http://hg.secondlife.com/viewer-beta/changeset/4072bd5389b2 Reviewed by Brad
2010-12-01state change events for updater service.Andrew A. de Laix
2010-12-01Fixes for viewer-development merge into viewer-mesh.Loren Shih
Manually merged llappviewer and viewer_manifest.py.
2010-12-01mergeDave Parks