summaryrefslogtreecommitdiff
path: root/indra/newview
AgeCommit message (Collapse)Author
2013-05-28NORSPEC-211 less intrusive version of this fixGraham Madarasz
2013-05-28NORSPEC-211 better handling of diff alpha modeGraham Madarasz
2013-05-28NORSPEC-182 do not add 'Use Texture' menu items in XML to avoid accidental ↵Graham Madarasz
appearance in menu 1st time
2013-05-25Merge viewer-dev-matGraham Madarasz
2013-05-24NORSPEC-189 throw caution to the wind and avoid using getVolume() check ↵Graham Madarasz
which has deleterious effects on materials rendering
2013-05-24NORSPEC-96 NORSPEC-189 another attempt at planar stretch across all 3 ↵Graham Madarasz
channels and make the materials CB use a UUID instead of this pointer for safety
2013-05-24norspec-107: remove the need for a friend declaration in local texturesOz Linden
2013-05-24MATBUG-8: fix local texture support for normal and specular mapsSerpentu
2013-05-24merge changes for maint-2724Oz Linden
2013-05-24NORSPEC-210 fix issues with the map used to store TE-specific registrations ↵Graham Madarasz
which was only invoking the CB for the last TE on log-in by replacing std::map with boost::unordered_map
2013-05-23NORSPEC-192 fix more incorrect batching, fix bug in reflecting normal map ↵Graham Madarasz
state in build tool, and protect against callback crashes when switching regions
2013-05-23MAINT-2724: Make viewer explicitly set coroutine stack size.Nat Goodspeed
Introduce LLCoros::setStackSize(), with a compile-time default value we hope we never have to use. Make LLAppViewer call it with the value of the new settings variable CoroutineStackSize as soon as we've read settings files. (While we're at it, notify interested parties that we've read settings files.) Give CoroutineStackSize a default value four times the previous default stack size. Make LLCoros::launch() pass the saved stack size to each new coroutine instance. Re-enable lleventcoro integration test. Use LLSDMap() construct rather than LLSD::insert(), which used to return the modified object but is now void.
2013-05-23NORSPEC-208 re-enable TE-specific material mgr registration to avoid ↵Graham Madarasz
cross-talk when editing faces
2013-05-23NORSPEC-193 NORSPEC-161 add new batch break criterion to ↵Graham Madarasz
CompareBatchBreakerModified and add shortcut for materials info dump
2013-05-23NORSPEC-193 NORSPEC-161 make legacy shiny a batch breaker when materials are ↵Graham Madarasz
in play
2013-05-22NORSPEC-204 make tex controls act like diffuse map when in media modeGraham Madarasz
2013-05-22NORSPEC-186 clamp norm/spec map rotations to 0-360 until we can fix the ↵Graham Madarasz (Graham)
server side issue with negative rotations
2013-05-22MergeGraham Madarasz (Graham)
2013-05-22NORSPEC-205 more dueling spec controlsGraham Madarasz (Graham)
2013-05-22merge latest project repoOz Linden
2013-05-22merge changes for 3.5.3-releaseOz Linden
2013-05-22NORSPEC-203 fix handling of objs with materials due to alpha mode in ↵Graham Madarasz
non-deferred
2013-05-21NORSPEC-96 tweak fix to follow clone/modify/re-apply pattern from build tool ↵Graham Madarasz
to avoid changing objects sharing a material
2013-05-21NORSPEC-96 slight refrain, make Stretch Textures apply to norm/spec maps in ↵Graham Madarasz
planar texgen mode
2013-05-21MergeGraham Madarasz
2013-05-21merge changes for maint-2628Oz Linden
2013-05-21NORSPEC-200 fix regression from 188 fix caused by not having enough bits to ↵Graham Madarasz
store SHINY_TEXTURE in the TEs bitfield
2013-05-21merge changes for chop-947Oz Linden
2013-05-21BUG-2432: Crashfix. Don't call map::erase when the iterator is not valid.Oz Linden
2013-05-21CHOP-947: create summary.json (really python) metadata file for TeamCity resultsOz Linden
2013-05-21Automated merge with ↵Dave Parks
https://bitbucket.org/lindenlab/viewer-development-materials
2013-05-21CHOP-948: correctly persist the UpdaterWillingToTest preferenceOz Linden
2013-05-20NORSPEC-191 make alpha masked rigged faces appear with deferred rendering on ↵Graham Madarasz
and off
2013-05-20MergeGraham Madarasz
2013-05-20NORSPEC-188 avoid removing 'Use Texture' item when cancelling from picker ↵Graham Madarasz
back to having prev texture
2013-05-20NORSPEC-197 Fix for fullbright alpha masked objects not renderingDave Parks
2013-05-20NORSPEC-168 fix UI update to not re-add the 'Use Texture' item when ↵Graham Madarasz
selecting legacy bump settings
2013-05-17increment version to 3.5.3 to be higher than the releaseOz Linden
2013-05-17merge changes for lastest integrationsOz Linden
2013-05-17Merge vwr-dev-matGraham Madarasz (Graham)
2013-05-17NORSPEC-189 restore old mat param update registrationGraham Madarasz (Graham)
2013-05-17merge changes for latest integration repoOz Linden
2013-05-17increment version to 3.6.0Oz Linden
2013-05-17Automated merge with ↵Dave Parks
https://bitbucket.org/lindenlab/viewer-development-materials
2013-05-17NORSPEC-187 Add directionality to ambient lighting.Dave Parks
2013-05-17Extra fix for Dave's shader OS X related shader changecallum_linden
2013-05-17Backout OpenGL 2.1 compatibility attemptDave Parks
2013-05-17NORSPEC-187 Directional ambient work in progress.Dave Parks
2013-05-17Merge with headcallum_linden
2013-05-16Fix for compilation error in shadows disabled and don't load transform ↵Dave Parks
feedback shaders unless transform feedback is enabled.