summaryrefslogtreecommitdiff
path: root/indra/lib/python
AgeCommit message (Collapse)Author
2010-09-27MergeLeyla Farazha
2010-09-03Post-convert merge by convert_monolith.py from ↵Aimee Linden
/Users/Aimee/Documents/Work/Linden-Lab/Development/viewer/convert/viewer-identity-evolution
2010-09-16STORM-168 : Python modules cleanupMerov Linden
2010-08-18VWR-20747 (SNOW-527) FIXED Don't import deprecated python module setsAimee Linden
2010-08-13Change license from GPL to LGPL (version 2.1)Oz Linden
2010-08-12correct license tags from "internal" to "viewergpl"Oz Linden
2010-06-18Make 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-11EXT-4163 Don't strip viewer symbols, or tar the result, in DEBUG buildsTofu Linden
2009-11-05Added calls to ll_deploy_sharedlibs_commandMark Palange (Mani)
Using viewer_manifest.py for windows dependency deployment during build. Added SHARED_LIBS_REL_PATH var to cmake cache.
2009-10-01Routing mt.exe output to NUL to hopefully fix expected error build failures...Mark Palange (Mani)
2009-09-30Updated test_win32_manifest.py to throw custom exception objects, rather ↵brad kittenbrink
than relying on string comparison.
2009-09-25Changes force no crt manifest linking in windows plugin files.Mark Palange (Mani)
2009-09-18Minor tweaks of test_win32_manifest output.brad kittenbrink
2009-09-18Merged latest viewer/viewer-20 into login-api.brad kittenbrink
2009-09-15Fixed 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-08merged cg's automated build script changes into login-apibrad kittenbrink
2009-09-08MergeBryan O'Sullivan
2009-09-01Use rev numbers instead of changeset IDs for now.Bryan O'Sullivan
2009-09-01Patch in some other useful scripts from trunk.Bryan O'Sullivan
2009-08-26Add Mercurial-specific build version info.Bryan O'Sullivan
Pilfered from billc.
2009-07-01svn merge -r125825:125901 svn+ssh://svn.lindenlab.com/svn/user/cg/qar-1654Christian Goetze
QAR-1654 merge completed.
2009-06-22Python 2.4 and 2.6 improvementsBryan 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-19Adding back the setting of "DEBUG", the lack of which caused many unitRobert Knop
tests to fail.
2009-05-18Result of svn merge -r119432:120464 ↵Aaron Brashears
svn+ssh://svn/svn/linden/branches/http_database/merge-03 into trunk. QAR-1462
2009-04-08svn merge -r116334:116916 ↵Ryan Williams
svn+ssh://svn.lindenlab.com/svn/linden/branches/rad-chilies/rad-chilies-trunkmerge-2
2009-03-27Result 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-17svn merge -r108142:108148 ↵Andrew Meadows
svn+ssh://svn.lindenlab.com/svn/linden/qa/maint-server/maint-server-5-r108113
2009-01-08Result of svn merge -r107256:107258 ↵Aaron Brashears
svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165
2008-12-23QAR-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-09svn 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-04Merging 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-18QAR-963 svn merge -r101685:101752 ↵Christian Goetze
svn+ssh://svn.lindenlab.com/svn/linden/branches/rad-chilies/rc05-release-merge
2008-11-07Merged 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-10DEV-22018 : cllsd unit test failures. Fixed mostly by changing the Python ↵Ryan Williams
code and the tests to look more like cllsd.
2008-10-10svn merge -r99056:99248 ↵Andrew Meadows
svn+ssh://svn.lindenlab.com/svn/linden/branches/andrew/gcc-4-003-for-merge
2008-10-09QAR-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-01svn merge -r96886:98039 ↵Christian Goetze
svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-24-Server --> release
2008-09-29Result of svn merge -r97546:97641 ↵Aaron Brashears
svn+ssh://svn/svn/linden/branches/apache-caps/merge-to-release into release. QAR-824
2008-09-16QAR-751 : Merge Agent Inventory Services - Fetch Inventory and Fetch ↵Kartic Krishnamurthy
Inventory Descendents - to Release Related Jiras: 1. DEV-17797 New Top Causes of Inventory Loss is Attachments with null folder_id 2. DEV-17937 null asset id not handled correctly in ais inventory fetch 3. OPSRT-1097 Update python-indra package on the system images 4. DEV-20505 QAR-751: Banning Cap "FetchLibDescendents" results in error in viewer log. 5. DEV-20328 QAR-751 Excessive log spam when using ais viewer against ais sim 6. DEV-20335 QAR-751 AIS bans are missing from message.xml svn merge -r95983:96590 svn+ssh://svn/svn/linden/branches/ais-for-merge-qar-751 . Miscellaneous commit: 1. Fixed silly bug in llsd-rest that broke connects to https on a non-standard port
2008-08-27One-liner fix for indra.base.llsd.parse_datestr. Ensure that seconds are ↵Kyle Ambroff
always 2 digits if there are no microseconds. Updated unit tests to enforce this. Reviewed by James.
2008-08-21Master QAR-807 passed.Kartic Krishnamurthy
Sub-QARs 1. QAR-765 Rad chilies 04 to Release 2. QAR-799 Merge PHP Framework 4 changes to release 3. QAR-801 Merge Buildme for startlocationfix svn merge -r93906:94028 svn+ssh://svn/svn/linden/branches/combo-merge-qar-765-799 .
2008-07-10QAR-622 merge -r91846:91877 svn+ssh://svn/svn/linden/branches/scut-newstyle-5Christian Goetze
2008-06-18Squeezing fix for DEV-16861: Tracebacks in backbone(multiagentchat) into ↵Jon Wolk
release. 2 line change. Approved by josh
2008-06-06QAR-650 - Viewer RC 9 merge -> release (post cmake)Steven Bennetts
merge release@88802 Branch_1-20-Viewer-2-merge-1@89178 -> release
2008-06-02svn merge -r88806:88810 ↵Ryan Williams
svn+ssh://svn.lindenlab.com/svn/linden/branches/escrow/liquid-banjo-05 into release
2008-06-02svn merge -r88066:88786 ↵Bryan O'Sullivan
svn+ssh://svn.lindenlab.com/svn/linden/branches/cmake-9-merge dataserver-is-deprecated for-fucks-sake-whats-with-these-commit-markers
2008-05-19EFFECTIVE MERGES:Don Kjer
svn merge -r 79616:82632 svn+ssh://svn/svn/linden/branches/maintenance/maintenance-7 into release svn merge -r 83211:87215 svn+ssh://svn/svn/linden/branches/php-framework-3 into release ACTUAL MERGE: svn merge -r 87631:87698 svn+ssh://svn/svn/linden/qa/combo-merge-maintenance-7-php-framework-3 into release dataserver-is-deprecated
2008-05-13svn merge -r87349:87423 ↵Ryan Williams
svn+ssh://svn.lindenlab.com/svn/linden/branches/escrow/liquid-banjo-03-merge release dataserver-is-deprecated
2008-05-07Back out QAR-520 maintenance-7 merge -- svn merge -r 86947:86946 ↵Brian McGroarty
svn+ssh://svn.lindenlab.com/svn/linden/release dataserver-is-deprecated
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-30 06:16:23 +0000