summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2012-09-12Automated merge with http://bitbucket.org/oz_linden/viewer-beta-notcmallocDave Parks
2012-09-12MAINT-1503 Minimal set of changes needed to safely disable tcmallocDave Parks
2012-09-12Fixing merge conflicts related to restoring DRTVWR-167 changesBrad Payne (Vir Linden)
2012-09-12initial attempt to restore changes that make removing tcmalloc possible; not ↵Oz Linden
tested
2012-09-11merge changes for DRTVWR-213Oz Linden
2012-09-10Backing out the changes contributing to DRTVWR-167 and DRTVWR-179 from the ↵William Todd Stinson
repository.
2012-09-09Merge with latest viewer-dev.Jonathan Goodman
2012-09-09Use a customized normalized gaussian specular term.Jonathan Goodman
2012-09-06Updating the viewer to handle diffuse alpha as mode rather than a boolean.William Todd Stinson
2012-09-04Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-development.William Todd Stinson
2012-09-04merge changes for DRTVWR-207Oz Linden
2012-08-31Adding ability to clear the materials from the selected object faces.William Todd Stinson
2012-08-31Implemented functionality to test Post requests.William Todd Stinson
2012-08-31Adding a scroll list to report the response from the Put request.William Todd Stinson
2012-08-31merge changes forOz Linden
2012-08-31Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-development.William Todd Stinson
2012-08-31Merged with latest viewer-dev.Jonathan Goodman
2012-08-30Adding results from the Get method to a scroll list table.William Todd Stinson
2012-08-30Enabling toggle of the Put button based on the in-world object selection.William Todd Stinson
2012-08-30Adding more data to test PUT server functionality.William Todd Stinson
2012-08-30WIP INTL-46 Set24 translation for traditional chinese; add new files; remove ↵eli
obsolete files
2012-08-30FIX INTL-101 translation of set33 for 8 languages; add new files; remove ↵eli
obsolete files
2012-08-29First pass at throwing together a test panel for the material capability ↵William Todd Stinson
service.
2012-08-29WIP INTL-46 Traditional Chinese translation for Set23TW (120829)eli
2012-08-29MAINT-1455 FIX Media Texture not visually updated correctlycallum
Reviewed by me. (Bao created)
2012-08-29Use an unordered map for custom #defines instead of a map. Lookups are ↵Jonathan Goodman
faster, and we don't really care about any particular order anyways for these.
2012-08-29Added the ability to remove a preprocessor define.Jonathan Goodman
2012-08-29Just pass in an empty preprocessor definition map from now on. The shader ↵Jonathan Goodman
compiler won't add new #defines if it's empty.
2012-08-28Added new bindTexture and unbindTexture API to LLGLSLShader. Reviewed by davep.Jonathan Goodman
2012-08-28Added support for adding custom preprocessor definitions (for shader ↵Jonathan Goodman
permutations)
2012-08-27MAINT-1480: Ensuring that the new angular velocity is remembered for later ↵William Todd Stinson
comparison to the previous angular velocity.
2012-08-27PATH-868: Ensuring that walkability values are reset to a previous value if ↵Todd Stinson
the empty string is entered.
2012-08-27MAINT-1480: Clearing the angular velocity accummulation when the updated ↵Todd Stinson
angular velocity is set to zero.
2012-08-22Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta.Todd Stinson
2012-08-22PATH-864: Altering the minimum linksets floater size to smaller to allow ↵Todd Stinson
fitting to 1024 width screens.
2012-08-22merge changes for DRTVWR-202Oz Linden
2012-08-22Fix up white space to follow coding policy guidelinescallum_linden
2012-08-22pull back release hotfix and beta fixesOz Linden
2012-08-22merge changes for DRTVWR-201Oz Linden
2012-08-22merge changes forOz Linden
2012-08-22merge changes for DRTVWR-203Oz Linden
2012-08-22merge back 3.4.0-beta3 fixesOz Linden
2012-08-21storm-1906: correct cmake error when using precompiled llphysicsextensions_tpvOz Linden
2012-08-20merge back beta fixesOz Linden
2012-08-17MAINT-1439: BUGFIX Correcting Kart 1.0 issue with physical objects using ↵Todd Stinson
angular velocity.
2012-08-17Minor change required for merge from viewer-developmentAura Linden
2012-08-17Merged in from viewer-development.Aura Linden
2012-08-16merge changes for DRTVWR-197Oz Linden
2012-08-16PATH-852: Attempting to fix the format of the BMP cursors for linux.Todd Stinson
2012-08-16Silly Python 'string' fixcallumprentice