summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Expand)Author
2012-09-12re-merge changes to disable tcmallocOz Linden
2012-09-12merge increment of version numberOz Linden
2012-09-12increment version to 3.4.2Oz Linden
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
2012-09-11merge changes for DRTVWR-213Oz Linden
2012-09-10Backing out the changes contributing to DRTVWR-167 and DRTVWR-179 from the re...William Todd Stinson
2012-09-04merge changes for DRTVWR-207Oz Linden
2012-08-31merge changes forOz Linden
2012-08-30WIP INTL-46 Set24 translation for traditional chinese; add new files; remove ...eli
2012-08-30FIX INTL-101 translation of set33 for 8 languages; add new files; remove obso...eli
2012-08-29WIP INTL-46 Traditional Chinese translation for Set23TW (120829)eli
2012-08-29MAINT-1455 FIX Media Texture not visually updated correctlycallum
2012-08-27MAINT-1480: Ensuring that the new angular velocity is remembered for later co...William Todd Stinson
2012-08-27PATH-868: Ensuring that walkability values are reset to a previous value if t...Todd Stinson
2012-08-27MAINT-1480: Clearing the angular velocity accummulation when the updated angu...Todd Stinson
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 fitt...Todd Stinson
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 angu...Todd Stinson
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 build...Todd Stinson