summaryrefslogtreecommitdiff
path: root/indra/newview
AgeCommit message (Collapse)Author
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 VWR-25016 en_xui_changeeli_linden
2011-05-23sync with viewer-developmenteli_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-20correct license headersOz Linden
2011-05-20fix more DOS line endingsOz Linden
2011-05-20merge changes for sh-1591Oz Linden
2011-05-20Revamped viewer cache preference controls.Logan Dethrow
Implemented improved cache control user interface, changes approved by wolf. * Moved viewer cache controls from the setup preference panel to advanced * Changed cache size control slider into a spinner * Readded a clear cache button along with a cache clear confirmation dialog * Renamed the reset button to "Default Location" to clarify its function Related JIRAs: ER-815 ER-816 ER-818 ER-820 ER-821 ER-831
2011-05-20automated merge mesh-development -> davep-mesh-candidate-2010Loren Shih
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-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
2011-05-19FIX VWR-25009eli
2011-05-19FIX VWR-24161 en_xui_changeeli
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-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-18fix for SH-1591: crash at LLVOCacheEntry::~LLVOCacheEntry() line 138Xiaohong Bao
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-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-17SH-1555 Disable upload button if a hull exists that has more than 256 vertices.Dave Parks