summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2012-08-31Merged with latest viewer-dev.Jonathan Goodman
2012-08-29WIP INTL-46 Traditional Chinese translation for Set23TW (120829)eli
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-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
2012-08-16Silly Python 'string' fixcallumprentice
2012-08-16Silly typo fixcallumprentice
2012-08-16merge changes for storm-1879Oz Linden
2012-08-16merge changes for storm-1895Oz Linden
2012-08-16merge changes for storm-1898Oz Linden
2012-08-16merge changes for storm-1899Oz Linden
2012-08-16merge up to latest viewer-developmentOz Linden
2012-08-15Add explicit reference to keychain to usecallumprentice
2012-08-15merge back beta fixesOz Linden
2012-08-15silly typo - change language from dutch to english :)callumprentice
2012-08-15merge changes for DRTVWR-198Oz Linden
2012-08-15Changed name of keychain to match setup instructionscallum_linden
2012-08-15merge changes for DRTVWR-194Oz Linden
2012-08-1510.5 macs will begin looking for mac_legacy rather than macAura Linden
2012-08-14MAINT-1413,MAINT-1425,MAINT-1426: BUGFIX Correcting a problem where the ↵Todd Stinson
build/edit floater was being dirtied at the wrong time.
2012-08-14PATH-842: Another tweak to get the llSetTargetOmega functionality working in ↵Todd Stinson
the viewer.
2012-08-14PATH-856: Adding a new notification to indicate when the user will be ↵Todd Stinson
toggling the phantom flag of a linkset through the Pathfinding Linksets floater.
2012-08-14PATH-854: Adding support to display whether linksets are scripted or not in ↵Todd Stinson
the pathfinding linksets floater.
2012-08-14PATH-849: Group objects were losing their [group] identifier following the ↵Todd Stinson
last commit. This should fix that issue.
2012-08-14merge back beta fixesOz Linden
2012-08-14PATH-849: Refactoring the behavior after loading the owner name of a ↵Todd Stinson
pathfinding object into the avatar name cache so that each object can simply update its respective row in the scroll list rather than rebuilding from scratch after all names are loaded.
2012-08-14merge changes for DRTVWR-193Oz Linden
2012-08-14merge back beta fixesOz Linden
2012-08-14merge changes for DRTVWR-195Oz Linden
2012-08-14merge changes for DRTVWR-191Oz Linden
2012-08-14correct merge errorOz Linden
2012-08-14merge back beta fixesOz Linden
2012-08-14merge back beta fixesOz Linden