summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2011-05-25automated merge viewer-development -> mesh-developmentLoren Shih
2011-05-24Automated merge with http://hg.secondlife.com/mesh-developmentXiaohong Bao
2011-05-24fix forXiaohong Bao
SH-712:Asset error given on upload of duck.dae using High LOD for physics shape - Analyze seems to not complete; SH-889: Viewer crash when analyzing physics LOD; SH-890: Viewer crash on Exit after analyzing physics layer which never seems to complete
2011-05-24mergeDave Parks
2011-05-24SH-469 GL_ARB_texture_multisample supportDave Parks
2011-05-24separating meshes from instancesBrad Payne (Vir Linden)
2011-05-24merge changes for STORM-1277Debi King (Dessie)
2011-05-23fix VWR-25036eli_linden
2011-05-23FIX VWR-25029eli_linden
2011-05-23FIX VWR-25028eli_linden
2011-05-23FIX VWR-25027eli_linden
2011-05-23FIX VWR-25025 en_xui_changeeli_linden
2011-05-23SH-1492 WIPBrad Payne (Vir Linden)
2011-05-23mergeBrad Payne (Vir Linden)
2011-05-23SH-1492 WIPBrad Payne (Vir Linden)
2011-05-23FIX VWR-25024 en_xui_changeeli_linden
2011-05-23FIX VWR-25023 en_xui_changeeli_linden
2011-05-23FIX VWR-25022 en_xui_changeeli_linden
2011-05-23FIX VWR-24753eli_linden
2011-05-23STORM-1275 FIX viewer gets caught in infinite loop for decompstubNyx (Neal Orman)
Fixed setting the initialized flag for the decomposition stub case (for OS builds) so that the viewer doesn't hang when initializing the stub. Note that initialized will be set to true even when instance will return NULL.
2011-05-23Fix for sh-788prep
2011-05-23FIX VWR-25016 en_xui_changeeli_linden
2011-05-23Another fix for build failure - unused variable warningBrad Payne (Vir Linden)
2011-05-23Fixing missing newline that's making linux build failBrad Payne (Vir Linden)
2011-05-23sync with viewer-developmenteli_linden
2011-05-23mergeBrad Payne (Vir Linden)
2011-05-23SH-1492 WIPBrad Payne (Vir Linden)
2011-05-23SH-1492 WIPBrad Payne (Vir Linden)
2011-05-23SH-1616 FIX SL client crashes on startup for debug buildsNyx (Neal Orman)
Added more NULL checks for llconvexdecompositionstub, to avoid crashing. Clients won't be able to upload meshes using the stub, but should be able to run the client otherwise.
2011-05-23SH-1492 WIPBrad Payne (Vir Linden)
2011-05-23increment viewer version to 2.7.1Oz Linden
2011-05-20SH-1492 WIPBrad Payne (Vir Linden)
2011-05-20correct license headersOz Linden
2011-05-20fix more DOS line endingsOz Linden
2011-05-20merge changes for sh-1591Oz Linden
2011-05-20SH-1492 WIPBrad Payne (Vir Linden)
2011-05-20Added NewAccountingEnabled capprep linden
2011-05-20SH-1252 and SH-1253 WIP.prep linden
2011-05-20Automated merge up from viewer-development into mesh-developmentLoren Shih
2011-05-19mergeDave Parks
2011-05-19SH-469 WIP -- get rid of LLMultiSampleBuffer and use ↵Dave Parks
GL_ARB_texture_multisample instead.
2011-05-19SH-1618 FIX -- Lighting and shadows crash ATI macsLeslie Linden
* Fixed ATI mac "lighting and shadows" related crash * Fixed up numerous GL errors on macs related to multiple color formats, the use of glEnable/glDisable on textures above the texture unit count and old ATI-specific code that was not appropriate for Mac. * Disabled SSAO for ATI macs due to it not working with shadows * Ongoing work to properly get shadows and SSAO functioning on ATI macs is required. Reviewed by davep
2011-05-19FIX VWR-25021eli
2011-05-19FIX VWR-25020eli
2011-05-19FIX VWR-25019eli
2011-05-19WIP VWR-25018eli
2011-05-19FIX VWR-25017 en_xui_changeeli
2011-05-19FIX VWR-25015eli
2011-05-19FIX VWR-25011 en_xui_changeeli
2011-05-19FIX VWR-25010 en_xui_changeeli