summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-06-27CHOP-956: Add settings_install.xml to settings_files.xml.Nat Goodspeed
Also clarify comment for ELLPath in lldir.h: ELLPath int values are read from settings_files.xml.
2013-06-26Automated merge with ↵Dave Parks
https://bitbucket.org/lindenlab/viewer-development-materials
2013-06-26MATBUG-194 Fix for crazy colors on projector shadows with NVIDIA OpenGL 3.3 ↵Dave Parks
implementations
2013-06-26mergeNyx Linden
2013-06-26SH-4226 FIX wearing petite outfit gives appearance responder errorsNyx Linden
Requesting appearance updates on updateGeometry for the avatar was spamming the back-end and causing the throttling mechanism to get hit. Removing that caused a re-introduction of SH-4109, so added a callback to link creation in the COF for attachments to request an appearance update. This should cause us to request an appearance update once per attachment attached, where before we were seeing up to 8 redundant requests.
2013-06-26SH-4300 WIP - set wearable ordering desc fields in slammer during ↵Brad Payne (Vir Linden)
updateCOF(), should need to go item-by-item fairly rarely.
2013-06-26Merge vwr-dev-matGraham Madarasz (Graham)
2013-06-26Remove patch fileGraham Madarasz (Graham)
2013-06-26Added tag 3.6.1-release for changeset 75cf8e855ae1Oz Linden
2013-06-26Merge cleanup.Dave Parks
2013-06-26SH-4300 WIP - removed unused update_base_outfit stuff in ↵Brad Payne (Vir Linden)
updateClothingOrderingInfo()
2013-06-26Automated merge with https://bitbucket.org/davep/viewer-release-iqa-1366Dave Parks
2013-06-26Automated merge with ↵Dave Parks
https://bitbucket.org/lindenlab/viewer-development-materials
2013-06-26NORSPEC-290 Allow shader compiler to unroll loop in multiPointLightFDave Parks
2013-06-26CHUI-983 FIXED Call showHistory() after clicking toast as it was before. ↵Mnikolenko ProductEngine
Minor change in showHistory()
2013-06-26SH-4305 WIP - cleanupBrad Payne (Vir Linden)
2013-06-26SH-4305 WIP - one more case where we need to use slammer to update categoryBrad Payne (Vir Linden)
2013-06-26SH-4305 WIP - fix for compiler grumbling on linux build.Brad Payne (Vir Linden)
2013-06-26NORSPEC-29: use the MaxMaterialsPerTransaction simulator feature if availableOz Linden
2013-06-25Merge vwr-dev-matGraham Linden
2013-06-25NORSPEC-288 remove unassertable asserts from restoring code to condition ↵Graham Linden
normals for this fix
2013-06-25MATBUG-78 Fix for alpha lighting falloff not matching opaque lighting ↵Dave Parks
falloff (again).
2013-06-25SH-4305 WIPBrad Payne (Vir Linden)
2013-06-25CHOP-957: Stop looking for, or parsing, Mac arguments.txt file.Nat Goodspeed
2013-06-25CHOP-957: Stop reading gridargs.dat in 'secondlife' wrapper script.Nat Goodspeed
However, for backwards compatibility, continue to recognize and discard --skip-gridargs switch.
2013-06-25merge changes for NORSPEC-280Oz Linden
2013-06-25merge changes for NORSPEC-280Oz Linden
2013-06-25NORSPEC-288 WIP fixes the issue with normal gen, but may be a bigger perf ↵Graham Linden
hit than we want
2013-06-25NORSPEC-250 add setting to force higher LUT precision and made LUT cleanup ↵Graham Linden
match creation
2013-06-25Merge vwr-dev-matGraham Linden
2013-06-25SH-4243 FIX - removed wait for category creation, since callback-based cap ↵Brad Payne (Vir Linden)
only works correctly if a recent fix is deployed server-side. May revisit at some point.
2013-06-24MergeGraham Linden
2013-06-24NORSPEC-259 nerfed copyContentsToFramebuffer handling of non-FBO sourcesGraham Linden
2013-06-24CHOP-955, CHOP-957: Platform-specific switches files => settings_install.xml.Nat Goodspeed
Instead of generating viewer command-line switch overrides into the Windows shortcut, an arguments.txt file on Mac, or a gridargs.dat file on Linux, generate a platform-independent settings_install.xml file containing 'sourceid' key (if 'sourceid' found in TeamCity environment variables). All command-line override switches previously found in the aforementioned files have happily become moot.
2013-06-24SH-4243 WIP - cleaned up callback structure for createNewCategory, modified ↵Brad Payne (Vir Linden)
makeNewOutfitLinks() to wait for category creation before populating.
2013-06-24MAINT-2800 revert changes to objectSkinV to make it match 3.6.0 code and not ↵Graham Madarasz (Graham)
slow down on ATI on Mac
2013-06-24merge changes for DRTVWR-326 3.6.1-beta1Oz Linden
2013-06-24MATBUG-194 WIP investigate if light func sampling precision is causing ↵Graham Madarasz (Graham)
whirly's wierdness
2013-06-24mergeBrad Payne (Vir Linden)
2013-06-24NORSPEC-280 include fix to downsampleDepthRect shader making GL 3.3. drivers cryGraham Linden
2013-06-21SH-4240 FIX Users can set their hover height to 0Nyx Linden
Adjusted the startup conditions, and relogging should apply the enforcement as appropriate now. Note that this affects the startup enforcement and should re-test the macro avatar loading bug.
2013-06-22mergemberezhnoy
2013-06-22build fixmberezhnoy
2013-06-21Merge cleanup.Dave Parks
2013-06-21NORSPEC-280 Fix for shader compilation error on OpenGL 3.3Dave Parks
2013-06-21Automated merge with file:///F:%5Cviewer-bearDave Parks
2013-06-21Only render bounding boxes for volumes in info display.Dave Parks
2013-06-20NORSPEC-277 WIP backout old-school normal permutationGraham Linden
2013-06-20Try to track down some bad bounding boxes in particles.Dave Parks
2013-06-20MATBUG-204 Fix for crash in genVolumeBBoxesDave Parks