summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2011-05-06Automated merge with ssh://bitbucket.org/brad_linden/viewer-mustbuildfaster-0brad kittenbrink
2011-05-06Continuing work on CHOP-609 build time improvements. Fixed eroneous ↵brad kittenbrink
additional_INCLUDE_DIRS setting for unit tests.
2011-05-05Work in progress on CHOP-609 / CHOP-624 build time improvements. Eliminated ↵brad kittenbrink
a bunch of unnecesary header dependencies.
2011-05-05Merged latest lindenlab/viewer-development with ↵brad kittenbrink
brad_linden/viewer-mustbuildfaster-0.
2011-05-05pull back changesets for avatar physics beta fixesOz Linden
2011-05-04merge changes for storm-1141Oz Linden
2011-05-04merge changes for storm-1223, storm-1218, storm-1216Oz Linden
2011-05-04Work in progress on CHOP-609. Added checking in indra/cmake/Prebuilt.cmake ↵brad kittenbrink
to skip unnecessary unpacking of already installed packages.
2011-05-04merge changes for storm-1219Oz Linden
2011-05-04merge changes for open-61Oz Linden
2011-05-04merged .hgtags with the one from viewer-releaseDebi King (Dessie)
2011-05-03Fix for CHOP-619. Found a general solution to our vs2010 precompiled ↵brad kittenbrink
headers problems and eliminated all our special cases for handling them.
2011-05-03Merge.brad kittenbrink
2011-05-03FIX VWR-22337 translation (in utf-8) for "loading terms of service" stringEli Linden
2011-05-03FIX VWR-25074 add missing Danish translationEli Linden
2011-05-02CHOP-599: if build.sh creates summary.json, package it with viewer.Nat Goodspeed
Recent versions of the viewer's build-dependent build.sh create and upload a summary.json file in the top level of the source repository checkout. Bundle that into the viewer installer. This is the one file that contains the viewer's version.
2011-05-02WIP VWR-25074 add missing string in English, pending actual Danish translationEli Linden
2011-05-02sync up with viewer-developmentEli Linden
2011-05-02increment viewer version to 2.6.8Oz Linden
2011-05-02merge changes for storm-1182Oz Linden
2011-05-02merge changes for storm-1128bOz Linden
2011-05-02merge changes for storm-380Oz Linden
2011-05-02merge changes for vwr-25126Oz Linden
2011-05-02merge changes for storm-229Oz Linden
2011-05-02merge changes for storm-956Oz Linden
2011-04-29STORM-1213 : pull from viewer-experience-mergeMerov Linden
2011-04-29STORM-1207 and STORM-1211 : pull l10n changes from eli's repoMerov Linden
2011-04-29Merged with viewer-development.Ricky Curtice
The reason was to manually resolve a couple of merge problems, as upstream has had several changes since this was applied, and some of the changes overlapped.
2011-04-29WIP CT-641 PL translation for Viewer set23, new filesEli Linden
2011-04-29WIP CT-641 PL translation for Viewer set23Eli Linden
2011-04-28STORM-1039 FIXED Bad iterator access in llavatarnamecache.cpp:564Richard Linden
missed else case
2011-04-28fixed build (again)Richard Linden
2011-04-28STORM-1039 FIXED Bad iterator access in llavatarnamecache.cpp:564Richard Linden
fixed crash on startup
2011-04-28WIP CT-636 CT-637 PL translation for Light Viewer set1 and set2, adding new ↵Eli Linden
files
2011-04-28WIP INTL-41 set23 DE/FR/ES/PT translation, new filesEli Linden
2011-04-28WIP INTL-41 set23 DE/FR/ES/PT translation; CT-640 set22 PL translationEli Linden
2011-04-28fixed buildRichard Linden
2011-04-28sync up with viewer-development, adding all existing minimal/xui l10n filesEli Linden
2011-04-28sync up with viewer-developmentEli Linden
2011-04-28Automated merge with ↵Richard Linden
bundle:E:\code\viewer-experience-merge+c:\users\richard\appdata\local\temp\thg.ia7ixc\http__hg.secondlife.com_viewer-development_csqen8.hg
2011-04-28Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience-merge/Richard Linden
2011-04-28EXP-749 FIX [REGRESSION] Voice status indicator shown in IM session instead ↵Richard Linden
of profile pic in Basic and Advanced modes reviewed by Leyla
2011-04-27Mergebrad kittenbrink
2011-04-27Incorporated some suggestions from code review for VWR-25610brad kittenbrink
2011-04-27Merge.brad kittenbrink
2011-04-27Fix for mac compile error in VWR-25608 fix.brad kittenbrink
2011-04-27STORM-1028 : pull into viewer-developmentMerov Linden
2011-04-26FIX CHOP-629: Enabled debugging info for llcommon.dllbrad kittenbrink
2011-04-26FIX VWR-25610: LLControlCroup::loadFromFile makes unnecessary copies of ↵brad kittenbrink
large LLSD objects.
2011-04-26FIX VWR-25609: crash on shutdown in LLGLNamePool::sInstances destructorbrad kittenbrink