summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
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-24separating meshes from instancesBrad Payne (Vir 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 for sh-788prep
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-23mergeBrad Payne (Vir Linden)
2011-05-23SH-1492 WIPBrad Payne (Vir Linden)
2011-05-23SH-1492 WIPBrad Payne (Vir Linden)
2011-05-23SH-1492 WIPBrad Payne (Vir Linden)
2011-05-20SH-1492 WIPBrad Payne (Vir 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-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-19merging head 58e0f8f72d39Oz Linden
2011-05-19merging head 7d0ac62a9c94Oz Linden
2011-05-19SH-769 FIXED Name field in model dialog allows 255 charactersLoren Shih
2011-05-19increment viewer version to 2.7.0Oz Linden
2011-05-19automated merge mesh-development -> mesh-developmentLoren Shih
2011-05-19merge changes for storm-1100Oz Linden
2011-05-19merge changes for STORM-1259 and STORM-1175Oz Linden
2011-05-19merge changes for storm-1032Oz Linden
2011-05-19merge changes for storm-941Oz Linden
2011-05-18storm-1267Oz Linden
2011-05-18merge changes for login-messagesOz Linden
2011-05-18merge changes for storm-859Oz Linden
2011-05-18mergeprep
2011-05-18Fix for sh-1227. Decoupled avatar in preview window from in world avatar. ↵prep
Code cleanup.
2011-05-18Automated merge with http://hg.secondlife.com/viewer-developmentNat Goodspeed
2011-05-18mergeDave Parks
2011-05-18Remove extraneous width declaration at behest of eli.Dave Parks
2011-05-18trying to fix mac build complaintsBrad Payne (Vir Linden)
2011-05-18merge latest updates from viewer-developmentOz Linden
2011-05-18merge changes for storm-941Oz Linden
2011-05-18merge changes for storm-1175Oz Linden
2011-05-18mergeBrad Payne (Vir Linden)
2011-05-18SH-1492 WIPBrad Payne (Vir Linden)
2011-05-18merge changes for storm-1032Oz Linden
2011-05-18merge changes for storm-1259Oz Linden
2011-05-18merge up latest viewer-development (post mesh)Oz Linden
2011-05-18SH-1586 Fix for bad camera behavior introduced by SH-1119Dave Parks
2011-05-18SH-914 Fix for normals getting screwed up by non-uniform model normalization.Dave Parks
2011-05-17SH-1555 Disable upload button if a hull exists that has more than 256 vertices.Dave Parks
2011-05-17merge notifications.xml fixOz Linden
2011-05-17remove junk from after close tagOz Linden