Age | Commit message (Collapse) | Author |
|
|
|
|
|
svn code
|
|
|
|
|
|
|
|
|
|
/Users/Aimee/Documents/Work/Linden-Lab/Development/viewer/convert/viewer-identity-evolution
|
|
|
|
|
|
|
|
|
|
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.
|
|
|
|
Using viewer_manifest.py for windows dependency deployment during build.
Added SHARED_LIBS_REL_PATH var to cmake cache.
|
|
|
|
than relying on string comparison.
|
|
|
|
|
|
|
|
Added CRT assembly check to viewer_manifest.py.
twiddled test_win32_manifest.py for ease of use.
|
|
|
|
|
|
|
|
|
|
Pilfered from billc.
|
|
QAR-1654 merge completed.
|
|
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.
|
|
tests to fail.
|
|
svn+ssh://svn/svn/linden/branches/http_database/merge-03 into trunk. QAR-1462
|
|
svn+ssh://svn.lindenlab.com/svn/linden/branches/rad-chilies/rad-chilies-trunkmerge-2
|
|
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
|
|
svn+ssh://svn.lindenlab.com/svn/linden/qa/maint-server/maint-server-5-r108113
|
|
svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165
|
|
svn merge -c 106471 svn+ssh://svn.lindenlab.com/svn/linden/qa/viewer_1-22-106055_merge
|
|
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
|
|
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.
|
|
svn+ssh://svn.lindenlab.com/svn/linden/branches/rad-chilies/rc05-release-merge
|
|
=================================
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
|
|
* 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.
|
|
code and the tests to look more like cllsd.
|
|
svn+ssh://svn.lindenlab.com/svn/linden/branches/andrew/gcc-4-003-for-merge
|
|
svn+ssh://svn/svn/linden/qa/sim-metrics/sim-metrics2-release-merge-98903 into release
|
|
svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-24-Server --> release
|
|
svn+ssh://svn/svn/linden/branches/apache-caps/merge-to-release into release. QAR-824
|
|
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
|
|
always 2 digits if there are no microseconds. Updated unit tests to enforce this. Reviewed by James.
|
|
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 .
|
|
|
|
release. 2 line change. Approved by josh
|