summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2010-12-03Automated merge up from viewer-developmentLoren Shih
2010-12-03mergeDave Parks
2010-12-03Add extern declarations of GL_ARB_framebuffer_object to glheades.hDave Parks
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-03Automated merge with https://hg.secondlife.com/mesh-developmentDave Parks
2010-12-03Switch default platform SDK to 10.6Dave Parks
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-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-02merge fixes for STORM-432Oz Linden
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-02automated merge up from viewer-developmentLoren Shih
2010-12-02Automated mergeLoren Shih
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-01Fixes for viewer-development merge into viewer-mesh.Loren Shih
Manually merged llappviewer and viewer_manifest.py.
2010-12-01mergeDave Parks
2010-12-01SH-391 Do some bounds checking on texture entry indices when aligning planar ↵Dave Parks
faces.
2010-12-01Add GTX 580 to GPU table.Dave Parks
2010-12-01Still fixing non-windows buildsBrad Payne (Vir Linden)
2010-12-01Fixing linux build failureBrad Payne (Vir Linden)
2010-12-01Moving timer code for AMD issue diagnosisBrad Payne (Vir Linden)
2010-12-01Manual fixes for merge-up errors from viewer-development.Loren Shih
2010-12-01Automated merge up from viewer-developmentLoren Shih
2010-12-01STORM-432 ADDITIONAL FIX Disabled manual resizing of the bottom panel in ↵Vadim ProductEngine
the inventory SP.
2010-11-30MergeLeyla Farazha
2010-11-30DN-217 Changing between View Display Names on and off during a conference ↵Leyla Farazha
call session put viewer in a state where last name resident was shown in viewer everywhere for user in conference call with last name resident.
2010-11-30STORM-667 FIXED Backed out changeset: 67c66befd75c. Restored white color for ↵Seth ProductEngine
name tag text.
2010-11-30Use architecture-independent code for windows fast timersBrad Payne (Vir Linden)
2010-11-30Automated merge from viewer-developmentLoren Shih
2010-11-30SH-435 FIXED Crash on login from infinite loop in LLVOAvatarSelfLoren Shih
Added additional check to prevent infinite loop. Blind fix since we have no repro.
2010-11-30Ditch fake anti-aliasing for deferred rendering.Dave Parks
2010-11-30mergeDave Parks
2010-11-30Far focal plane blur attenuation tweak.Dave Parks
2010-11-30Make importer use 3-light setup all the timeDave Parks
2010-11-29Pull viewer-beta into viewer-developmentMerov Linden
2010-11-29CHOP-223 : Pull into viewer-betaMerov Linden
2010-11-29Fix UpdaterServiceURL setting default. update.secondlife.com requires https ↵brad kittenbrink
access.
2010-11-29CHOP-223 : Pull into viewer-betaMerov Linden
2010-11-29STORM-672 : Fix duplicated name in Pref panelMerov Linden
2010-11-29CHOP-223 fix for more mac build breakage from the previous changes.brad kittenbrink
2010-11-29CHOP-223 fix for mac build breakage introduced in the last change.brad kittenbrink
2010-11-29Better fix for CHOP-223.brad kittenbrink
Comments on the mercurial bug tracker indicate that this bug is likely to recur, so we work around it in viewer_manifest.py now. http://mercurial.selenic.com/bts/issue1802
2010-11-29Automated merge with https://hg.secondlife.com/mesh-developmentNyx (Neal Orman)
2010-11-29SH-531 / CTS-324 FIX fix of VWR-20749 / SNOW-624 lost in mergeNyx (Neal Orman)
Re-applied fix originally committed in 1e93695ded30 Reveiewed code, appears straightforward.