summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2011-07-22merge changes for storm-1526Oz Linden
2011-07-22merge back release branch changesOz Linden
2011-07-22Automated merge with http://hg.secondlife.com/viewer-developmentNat Goodspeed
2011-07-22merge changes from snowstorm team review buildOz Linden
2011-07-21merge up changes for 2.8.0 releaseOz Linden
2011-07-21merge changes for storm-1519Oz Linden
2011-07-21merge changes for eli2_viewer-developmentOz Linden
2011-07-21merge late beta fixesOz Linden
2011-07-21merge changes for release tagsOz Linden
2011-07-20FIX INTL-58 set25, light set4 translation for 6 languageseli
2011-07-20Added tag DRTVWR-68_2.7.5-release, 2.7.5-release for changeset 6866d9df6efbDebi King (Dessie)
2011-07-20Re-indent teamcity service messages when scanning build logs to fix ↵Christian Goetze (CG)
incredibuild formatting.
2011-07-20Re-enable public build status indicatorsChristian Goetze (CG)
2011-07-19merge changes for storm-1487Oz Linden
2011-07-19merge changes for storm-1221Oz Linden
2011-07-19merge changes for storm-1502Oz Linden
2011-07-19merge changes for storm-1503Oz Linden
2011-07-19merge changes for vwr-26066Oz Linden
2011-07-19merge changes for storm-1476Oz Linden
2011-07-19STORM-1487 FIXED Changed the "get more gestures" marketplace URL.Vadim ProductEngine
2011-07-19STORM-1221 FIXED Hard coded dates made localizable under Group Profile ↵Seth ProductEngine
Land/Assets. Added a function for parsing a date string of specific format. Added strings defining the date format in Group Profile Land/Assets that should be localized.
2011-07-19More FormatMessage compile errors, try again to fixNat Goodspeed
2011-07-19Fix copy/paste error in swiped FormatMessage() example code.Nat Goodspeed
2011-07-19Per Josh's comments in http://codereview.lindenlab.com/6510035/Nat Goodspeed
Instead of low-level open(O_CREAT | O_EXCL) loop on all platforms, use GetTempFileName() on Windows and mkstemp() elsewhere. Don't append a final newline to NamedTempFile: use caller's data literally. Tweak a couple comments.
2011-07-18sync with viewer-developmenteli
2011-07-18merge changes for storm-1515Oz Linden
2011-07-18merge changes for storm-1517Oz Linden
2011-07-18merge changes for storm-1516Oz Linden
2011-07-18merge changes for storm-1510Oz Linden
2011-07-18merge changes for beta branch tagOz Linden
2011-07-18sync with viewer-developmenteli
2011-07-18merge changes for storm-1510Oz Linden
2011-07-18reconciled .hgtagsDebi King (Dessie)
2011-07-18Added tag DRTVWR-71_2.8.0-beta1, 2.8.0-beta1 for changeset e1ed60913230Debi King (Dessie)
2011-07-18increment viewer version to 2.8.2Oz Linden
2011-07-18Added tag 2.8.1-start for changeset 502f6a5deca9Oz Linden
2011-07-18re-enable the watchdogOz Linden
2011-07-17Decided against using Boost.Filesystem, remove from linkNat Goodspeed
2011-07-16Use raw-string syntax for other Windows pathnames inserted to Python.Nat Goodspeed
2011-07-16Use raw-string syntax for Python string containing Windows pathname.Nat Goodspeed
Consider this pathname for llsdserialize_test.cpp: C:\nats\indra\llcommon\tests\llsdserialize_test.cpp Embed that in a Python string literal: 'C:\nats\indra\llcommon\tests\llsdserialize_test.cpp' and you get a string containing: C: ats\indra\llcommon ests\llsdserialize_test.cpp where the \n became a newline and the \t became a tab character. Hopefully Python raw-string syntax r'C:\etc\etc' works better.
2011-07-16merge changes for storm-1482Oz Linden
2011-07-16merge late release changes and tagsOz Linden
2011-07-16pull back late beta fixOz Linden
2011-07-16Automated merge with https://bitbucket.org/lindenlab/viewer-developmentjenn
2011-07-15Use C++ __FILE__ rather than Python __file__ to find indra work area.Nat Goodspeed
In this case, the Python code in question is being written from a C++ string literal to a temp script file in a platform-dependent temp directory -- so the Python __file__ value tells you nothing about the location of the repository checkout. Embedding __FILE__ from the containing C++ source file works better.
2011-07-15Automated merge with https://bitbucket.org/lindenlab/viewer-developmentjenn
2011-07-15After review and testing, realized that 'WatchdogEnabled' is actually true ↵jenn
to its name, and is a boolean, not a timeout value. 'MainloopTimeoutDefault' is the actual timeout value. Updated descriptions and values accordingly to set Watchdog timeout to 60 seconds.
2011-07-15Merge for STORM-1482Aaron Stone
2011-07-15STORM-1482 Always run the crash loggers, they will check what to do and how ↵Aaron Stone
to clean up.
2011-07-15If we're going to need indra.base.llsd, have to munge sys.path.Nat Goodspeed
And at that point, the Python logic needed to bring in the llsd module is big enough to warrant capturing it in a separate string variable common to multiple tests.