Age | Commit message (Collapse) | Author | |
---|---|---|---|
2011-05-02 | STORM-1210 : Fix python merge glitch so to pass Release build (again) | Dave Parks | |
2011-02-18 | Automated merge up from viewer-development into mesh-development | Loren Shih | |
2011-02-11 | STORM-937 : Use subprocess instead os commands in python, suppress crufty ↵ | Merov Linden | |
svn code | |||
2011-02-09 | STORM-937 : Fix python scripts shebang line and license header for consistency | Merov Linden | |
2011-01-28 | STORM-937 : Makes all python paths use consistent syntax | Merov Linden | |
2010-12-29 | Automated merge up from viewer-development | Loren Shih | |
2010-12-27 | VWR-20879: Allow find_vc_dir() to work with VCExpress | Robin Cornelius | |
2010-10-20 | Automated merge up from viewer-development | Loren Shih | |
2010-10-13 | correct licenses (fix problem with license change merge) | Oz Linden | |
2010-09-27 | Merge | Leyla Farazha | |
2010-09-27 | merge | Dave Parks | |
2010-09-21 | Fix for build failures - disabling tcmalloc for now | Brad Payne (Vir Linden) | |
2010-09-03 | Post-convert merge by convert_monolith.py from ↵ | Aimee Linden | |
/Users/Aimee/Documents/Work/Linden-Lab/Development/viewer/convert/viewer-identity-evolution | |||
2010-09-16 | STORM-168 : Python modules cleanup | Merov Linden | |
2010-08-18 | VWR-20747 (SNOW-527) FIXED Don't import deprecated python module sets | Aimee Linden | |
2010-08-13 | Change license from GPL to LGPL (version 2.1) | Oz Linden | |
2010-08-12 | correct license tags from "internal" to "viewergpl" | Oz Linden | |
2010-06-18 | Make run_command() use subprocess.Popen() rather than os.popen(). | Nat Goodspeed | |
This lets us capture the command's stderr as well as stdout. I've been perplexed recently by errors from Mac SetFile commands that didn't report stderr. | |||
2010-01-11 | EXT-4163 Don't strip viewer symbols, or tar the result, in DEBUG builds | Tofu Linden | |
2009-11-05 | Added calls to ll_deploy_sharedlibs_command | Mark Palange (Mani) | |
Using viewer_manifest.py for windows dependency deployment during build. Added SHARED_LIBS_REL_PATH var to cmake cache. | |||
2009-10-01 | Routing mt.exe output to NUL to hopefully fix expected error build failures... | Mark Palange (Mani) | |
2009-09-30 | Updated test_win32_manifest.py to throw custom exception objects, rather ↵ | brad kittenbrink | |
than relying on string comparison. | |||
2009-09-25 | Changes force no crt manifest linking in windows plugin files. | Mark Palange (Mani) | |
2009-09-18 | Minor tweaks of test_win32_manifest output. | brad kittenbrink | |
2009-09-18 | Merged latest viewer/viewer-20 into login-api. | brad kittenbrink | |
2009-09-15 | Fixed up CopyWinLibs.cmake post moap/viewer-2.0.0-3 merge. | Mark Palange (Mani) | |
Added CRT assembly check to viewer_manifest.py. twiddled test_win32_manifest.py for ease of use. | |||
2009-09-08 | merged cg's automated build script changes into login-api | brad kittenbrink | |
2009-09-08 | Merge | Bryan O'Sullivan | |
2009-09-01 | Use rev numbers instead of changeset IDs for now. | Bryan O'Sullivan | |
2009-09-01 | Patch in some other useful scripts from trunk. | Bryan O'Sullivan | |
2009-08-26 | Add Mercurial-specific build version info. | Bryan O'Sullivan | |
Pilfered from billc. | |||
2009-07-01 | svn merge -r125825:125901 svn+ssh://svn.lindenlab.com/svn/user/cg/qar-1654 | Christian Goetze | |
QAR-1654 merge completed. | |||
2009-06-22 | Python 2.4 and 2.6 improvements | Bryan O'Sullivan | |
The sets module is no longer needed with Python 2.4, and causes a DeprecationWarning with 2.6, so drop it The md5 module causes a DeprecationWarning with 2.6, so try to import hashlib (its replacement) instead, else fall back Reviewed by Poppy. | |||
2009-05-19 | Adding back the setting of "DEBUG", the lack of which caused many unit | Robert Knop | |
tests to fail. | |||
2009-05-18 | Result of svn merge -r119432:120464 ↵ | Aaron Brashears | |
svn+ssh://svn/svn/linden/branches/http_database/merge-03 into trunk. QAR-1462 | |||
2009-04-08 | svn merge -r116334:116916 ↵ | Ryan Williams | |
svn+ssh://svn.lindenlab.com/svn/linden/branches/rad-chilies/rad-chilies-trunkmerge-2 | |||
2009-03-27 | Result of svn merge -r115238:115240 ↵ | Aaron Brashears | |
svn+ssh://svn/svn/linden/branches/trivial-changes/trivial_slave_merge into trunk. In turn a result of svn merge -r113279:113280 svn+ssh://svn/svn/linden/branches/trivial-changes/trivial-changes-1 into trivial_slave_merge and svn merge -r107805:110030 svn+ssh://svn/svn/user/phoenix/slave-ds into trivial_slave_merge. QAR-1329 | |||
2009-01-17 | svn merge -r108142:108148 ↵ | Andrew Meadows | |
svn+ssh://svn.lindenlab.com/svn/linden/qa/maint-server/maint-server-5-r108113 | |||
2009-01-08 | Result of svn merge -r107256:107258 ↵ | Aaron Brashears | |
svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 | |||
2008-12-23 | QAR-1142 merging 1.22 RC0-RC4 changes. | Mark Palange | |
svn merge -c 106471 svn+ssh://svn.lindenlab.com/svn/linden/qa/viewer_1-22-106055_merge | |||
2008-12-09 | svn merge -r104949:105037 ↵ | Ryan Williams | |
svn+ssh://svn.lindenlab.com/svn/linden/branches/rad-chilies/rad-chilies-06-release-merge QAR-1048: Distributed L$ Transactions > Rad Chilies 06 Indra items | |||
2008-12-04 | Merging from server/server-1.25 back to trunk. | Robert Knop | |
svn merge -r99446:104838 svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.25 Conflicts resolved by Prospero, except for one scary conflict in SendConfirmationEmail.php which was resolved by jarv. | |||
2008-11-18 | QAR-963 svn merge -r101685:101752 ↵ | Christian Goetze | |
svn+ssh://svn.lindenlab.com/svn/linden/branches/rad-chilies/rc05-release-merge | |||
2008-11-07 | Merged into release with command: | Kartic Krishnamurthy | |
================================= svn merge -r100865:101402 svn+ssh://svn/svn/linden/branches/purge-dpo-code-for-merge . QAR-951 : Sandbox QA for DEV 20842 - Ensure DPO is not enabled accidentally QAR-967 : Merge Build for DEV 20842 - Ensure DPOis not enabled accidentally QA tested: Beast, Oskar DEV's fulfilled as part of this branch: ====================================== DEV-20842 Prevent accidental activation of DPO procs DEV-23028 Mac build fails - link error dual inclusion DEV-20824 VWR-9255: Build fails on mac_updater and mac_crash_logger targets due to info.plist problems DEV-22997 Xcode project: 'server' target has no dependencies DEV-23353 Friend request custom messages come through as an asset tag. DEV-23309 Voice Chat Indicator does not show active voice status DEV-23187 Can't teleport to home location | |||
2008-11-04 | * Added del_empty_estates.py script. | John Biesley | |
* Shifted common code for copy_bans.py and del_empty_estates.py into the indra library. * Documented copy_bans.py and del_empty_estates.py. * Added iter_chunks generator to a new module: indra.util.iterators. * Added unit tests for indra.util.iterators. | |||
2008-10-10 | DEV-22018 : cllsd unit test failures. Fixed mostly by changing the Python ↵ | Ryan Williams | |
code and the tests to look more like cllsd. | |||
2008-10-10 | svn merge -r99056:99248 ↵ | Andrew Meadows | |
svn+ssh://svn.lindenlab.com/svn/linden/branches/andrew/gcc-4-003-for-merge | |||
2008-10-09 | QAR-907: svn merge -r 98908:98910 ↵ | Don Kjer | |
svn+ssh://svn/svn/linden/qa/sim-metrics/sim-metrics2-release-merge-98903 into release | |||
2008-10-01 | svn merge -r96886:98039 ↵ | Christian Goetze | |
svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-24-Server --> release | |||
2008-09-29 | Result of svn merge -r97546:97641 ↵ | Aaron Brashears | |
svn+ssh://svn/svn/linden/branches/apache-caps/merge-to-release into release. QAR-824 |