a4b223248e
Merge
2010-09-27 17:54:52 -07:00
ffae589843
Post-convert merge by convert_monolith.py from /Users/Aimee/Documents/Work/Linden-Lab/Development/viewer/convert/viewer-identity-evolution
2010-09-03 17:41:39 +01:00
a36033853a
STORM-168 : Python modules cleanup
2010-09-16 14:27:42 -07:00
fcb240792f
VWR-20747 (SNOW-527) FIXED Don't import deprecated python module sets
2010-08-18 11:58:24 +01:00
06b0d72efa
Change license from GPL to LGPL (version 2.1)
2010-08-13 07:24:57 -04:00
fedb5a25a2
correct license tags from "internal" to "viewergpl"
2010-08-12 20:30:21 -04:00
d34d8e491b
Make run_command() use subprocess.Popen() rather than os.popen().
...
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-06-18 17:43:30 -04:00
cbc0674a7a
EXT-4163 Don't strip viewer symbols, or tar the result, in DEBUG builds
2010-01-11 14:35:39 -08:00
9e69702fe7
Added calls to ll_deploy_sharedlibs_command
...
Using viewer_manifest.py for windows dependency deployment during build.
Added SHARED_LIBS_REL_PATH var to cmake cache.
2009-11-05 08:52:07 -08:00
0d0840de0e
Routing mt.exe output to NUL to hopefully fix expected error build failures...
2009-10-01 14:51:35 -07:00
292aecbb3e
Updated test_win32_manifest.py to throw custom exception objects, rather than relying on string comparison.
2009-09-30 18:57:00 -07:00
17f9fd5f96
Changes force no crt manifest linking in windows plugin files.
2009-09-25 19:23:24 -07:00
afb053ebd7
Minor tweaks of test_win32_manifest output.
2009-09-18 19:30:10 -04:00
bb1d4592bd
Merged latest viewer/viewer-20 into login-api.
2009-09-18 15:22:25 -04:00
93869a8ef2
Fixed up CopyWinLibs.cmake post moap/viewer-2.0.0-3 merge.
...
Added CRT assembly check to viewer_manifest.py.
twiddled test_win32_manifest.py for ease of use.
2009-09-15 12:32:22 -07:00
11d10bd53a
merged cg's automated build script changes into login-api
2009-09-08 16:44:38 -04:00
7ad3af45a6
Merge
2009-09-08 13:27:05 -07:00
dd628f29af
Use rev numbers instead of changeset IDs for now.
2009-09-01 11:54:34 -07:00
5f3a7fa6f3
Patch in some other useful scripts from trunk.
2009-09-01 11:18:33 -07:00
ff11d74820
Add Mercurial-specific build version info.
...
Pilfered from billc.
2009-08-26 10:57:38 -07:00
e588d1f284
svn merge -r125825:125901 svn+ssh://svn.lindenlab.com/svn/user/cg/qar-1654
...
QAR-1654 merge completed.
2009-07-01 00:22:05 +00:00
5f4c09fa1f
Python 2.4 and 2.6 improvements
...
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-06-22 22:36:36 +00:00
99660542bb
Adding back the setting of "DEBUG", the lack of which caused many unit
...
tests to fail.
2009-05-19 15:19:39 +00:00
6df2755ba6
Result of svn merge -r119432:120464 svn+ssh://svn/svn/linden/branches/http_database/merge-03 into trunk. QAR-1462
2009-05-18 23:38:35 +00:00
2768539bfe
svn merge -r116334:116916 svn+ssh://svn.lindenlab.com/svn/linden/branches/rad-chilies/rad-chilies-trunkmerge-2
2009-04-08 22:39:01 +00:00
a60c54568c
Result of svn merge -r115238:115240 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-03-27 19:40:03 +00:00
15a6d273cc
svn merge -r108142:108148 svn+ssh://svn.lindenlab.com/svn/linden/qa/maint-server/maint-server-5-r108113
2009-01-17 01:29:45 +00:00
e3cf284388
Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165
2009-01-08 00:05:06 +00:00
fb793870fe
QAR-1142 merging 1.22 RC0-RC4 changes.
...
svn merge -c 106471 svn+ssh://svn.lindenlab.com/svn/linden/qa/viewer_1-22-106055_merge
2008-12-23 19:39:58 +00:00
14a5879c88
svn merge -r104949:105037 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-09 22:41:28 +00:00
189599b6ff
Merging from server/server-1.25 back to trunk.
...
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-12-04 22:36:34 +00:00
a86aa7d8b0
QAR-963 svn merge -r101685:101752 svn+ssh://svn.lindenlab.com/svn/linden/branches/rad-chilies/rc05-release-merge
2008-11-18 21:20:05 +00:00
b2bfb128e7
Merged into release with command:
...
=================================
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-07 00:07:44 +00:00
091962408e
* Added del_empty_estates.py script.
...
* 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-11-04 16:57:17 +00:00
635c06bb46
DEV-22018 : cllsd unit test failures. Fixed mostly by changing the Python code and the tests to look more like cllsd.
2008-10-10 19:57:34 +00:00
5f3875018e
svn merge -r99056:99248 svn+ssh://svn.lindenlab.com/svn/linden/branches/andrew/gcc-4-003-for-merge
2008-10-10 16:04:02 +00:00
4ff16b735f
QAR-907: svn merge -r 98908:98910 svn+ssh://svn/svn/linden/qa/sim-metrics/sim-metrics2-release-merge-98903 into release
2008-10-09 18:07:46 +00:00
b069bb9e71
svn merge -r96886:98039 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-24-Server --> release
2008-10-01 00:42:47 +00:00
66739da164
Result of svn merge -r97546:97641 svn+ssh://svn/svn/linden/branches/apache-caps/merge-to-release into release. QAR-824
2008-09-29 17:41:54 +00:00
80f6196327
QAR-751 : Merge Agent Inventory Services - Fetch Inventory and Fetch 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-09-16 18:12:32 +00:00
cff714056a
One-liner fix for indra.base.llsd.parse_datestr. Ensure that seconds are always 2 digits if there are no microseconds. Updated unit tests to enforce this. Reviewed by James.
2008-08-27 22:49:10 +00:00
cb7abfd595
Master QAR-807 passed.
...
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-08-21 22:09:21 +00:00
40d2bb564d
QAR-622 merge -r91846:91877 svn+ssh://svn/svn/linden/branches/scut-newstyle-5
2008-07-10 16:52:33 +00:00
852d36a2b7
Squeezing fix for DEV-16861: Tracebacks in backbone(multiagentchat) into release. 2 line change. Approved by josh
2008-06-18 22:22:23 +00:00
ad33281007
QAR-650 - Viewer RC 9 merge -> release (post cmake)
...
merge release@88802 Branch_1-20-Viewer-2-merge-1@89178 -> release
2008-06-06 22:43:38 +00:00
5f002b429b
svn merge -r88806:88810 svn+ssh://svn.lindenlab.com/svn/linden/branches/escrow/liquid-banjo-05 into release
2008-06-02 23:25:14 +00:00
9db949eec3
svn merge -r88066:88786 svn+ssh://svn.lindenlab.com/svn/linden/branches/cmake-9-merge
...
dataserver-is-deprecated
for-fucks-sake-whats-with-these-commit-markers
2008-06-02 21:14:31 +00:00
3855896097
EFFECTIVE MERGES:
...
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-19 17:02:33 +00:00
52333fc830
svn merge -r87349:87423 svn+ssh://svn.lindenlab.com/svn/linden/branches/escrow/liquid-banjo-03-merge release dataserver-is-deprecated
2008-05-13 21:07:14 +00:00
d273ba2ce2
Back out QAR-520 maintenance-7 merge -- svn merge -r 86947:86946 svn+ssh://svn.lindenlab.com/svn/linden/release dataserver-is-deprecated
2008-05-07 20:48:38 +00:00
Leyla Farazha