3a67e9102b
svn merge -r 59813:59826 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
2007-04-02 23:27:49 +00:00
ea8fb7238e
svn merge -r 59364:59813 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
2007-03-31 01:41:19 +00:00
ffc6680d95
Merge of final upload-queue changes from Branch_1-13-4 --> release
...
svn merge -r 59496:59497 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-13-4 --> release
svn merge -r 59530:59531 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-13-4 --> release
svn merge -r 59827:59828 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-13-4 --> release
svn merge -r 59315:59316 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
In order, that's:
* back out upload-queue
* apply a subset
* apply the full thing
* re-merge the addition of the DELETE REST
Most of which turns into a no-op. Reviewed by don.
2007-03-30 17:23:42 +00:00
f01a90050f
Added highlighting for parcel flag object entry constants
2007-03-28 23:42:24 +00:00
204081b8e2
Ported MarkL's fix for SL-38277 to release from message-liberation-5. svn merge -r59784:59785 svn+ssh://svn.lindenlab.com/svn/linden/branches/message-liberation-5 into svn+ssh://svn.lindenlab.com/svn/linden/release.
2007-03-27 20:41:40 +00:00
64395d2159
Effectively: merge 59238:59702 Branch_1-13-4 --> release EXCEPT for the back out (r59497) and re-patch (r59531) of upload-queue, and fixes merged directly from Maintenance.
...
merge -r 59328:59428 Branch_1-13-4 --> release
* address regex needs "s" option to support multiline addresses. Patched previously, not sure how it got dropped.
* added new promo code to accommodate printer error
* Fix for SL-37108 "SVC-55: look at may be broken"
* Paired/reviewed with Qarl
* Release notes for Release Notes for 1.13.4(59329)
* merge release-candidate@58928 long-live-legacy-particles@59317 -> Branch_1-13-14
SKIP -r 59428:59437 (temporary), 59437:59465 (from release), 59465:59497 (back out of upload-queue)
merge -r 59497:59510 Branch_1-13-4 --> release
* SL-37932 legacy particle clean up
* SL-33228 llParticleSystem( [] ) may not shut down reliably
* SL-37909 llParticleSystem([ ]) bug now affects unlinked and root prims
SKIP -r 59510:59531 (re-patch of upload-queue)
merge -r 59531:59585 Branch_1-13-4 --> release
* blacklist and release notes updates
SKIP -r 59585:59656 (patches from maintenance)
merge -r 59656:59691 Branch_1-13-4 --> release
* blacklist and release notes updates
SKIP -r 59691:59702 (already ported to release)
2007-03-26 17:30:51 +00:00
720eab7a32
I broke linux and mac builds, reverting the changes from 59596
2007-03-22 22:03:42 +00:00
e9d8afed87
Couple steps closer to compiling on VC8, new boost headers and libs.
2007-03-22 21:24:41 +00:00
25f95cd08f
SL-38184 Make python scripts in linden/scripts run in place without PYTHONPATH or symlinks. Reviewed with Donovan.
2007-03-22 20:29:41 +00:00
c93c38e047
svn merge -r 59178:59364 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
2007-03-21 19:36:11 +00:00
fceae96eb1
svn merge -r59459:59476 svn+ssh://svn.lindenlab.com/svn/linden/branches/adroit.r69-75_2 into svn+ssh://svn.lindenlab.com/svn/linden/release.
2007-03-20 22:21:42 +00:00
5e9e67cb2d
merge -r 59028:59178 maintenance -> release.
2007-03-16 20:39:40 +00:00
1ada34fc0c
merge -r58842:59035 branches/loadstone-names to release
2007-03-16 17:29:45 +00:00
9d3309f684
SL-35314 - fix many openjpeg woes. QA'd.
...
svn merge svn+ssh://svn.lindenlab.com/svn/linden/release@58887
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/SL-35314-based-on-r58887
--> release
2007-03-16 11:39:49 +00:00
0947e139ed
svn merge -r 58433:58660 svn+ssh://svn/svn/linden/branches/upload-queue into release
2007-03-15 00:54:39 +00:00
00dbacb215
svn merge svn+ssh://svn.lindenlab.com/svn/linden/release@59161 svn+ssh://svn.lindenlab.com/svn/linden/branches/release-candidate@59163 --> release
2007-03-14 23:03:50 +00:00
cf40518428
merge -r 58986:59028 maintenance
2007-03-09 22:55:16 +00:00
b36dc36306
svn merge -r 58902:58986 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
2007-03-09 01:09:20 +00:00
6fa974fc64
svn merge -r 58859:58902 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
2007-03-08 00:25:12 +00:00
a00d02efef
SL-36804 Fixed offline IMs by changing source host dataserver checks to check against all dataservers.
...
Added some extra warnings to odd failure cases.
Cleaned up 1 extra line of inventory connector (from merge weirdness).
reviewed with leyla
2007-03-07 20:11:50 +00:00
068558f888
merge release@58791 vc8@58828 -> release
...
Adds Dev Studio 2005 (VC8)
Reviewed by Rob
2007-03-07 02:48:44 +00:00
c4059553af
SKIPPED 58849. merge -r 58856:58859 maintenance -> release
2007-03-07 01:16:27 +00:00
3d17ddd38b
merge -r 58751:58843 maintenance -> release
2007-03-07 01:13:34 +00:00
efcd347c80
merge -r 58734:58751 maintenance -> release
2007-03-06 01:01:51 +00:00
14360b815e
merge -r 58641:58711 maintenance -> release
2007-03-06 00:37:09 +00:00
b06b9cd304
svn merge -r 58117:58118 svn+ssh://svn.lindenlab.com/svn/linden/branches/release-candidate (into release)
...
Port of fix for SL-35327 which was fixed in release-candidate.
2007-03-05 23:04:46 +00:00
2602986875
merge -r58599:58732 branches/im-email-base32 to release
2007-03-05 22:25:49 +00:00
1d18eb043a
merge -r57991:58444 branches/distribute/user/mute to release
2007-03-05 22:09:52 +00:00
437882ca3b
merge r58577:58578 Branch_1-13-3 to release
2007-03-05 19:08:01 +00:00
7e99d870f2
Commented out temp fast timers that got checked in.
2007-03-03 19:02:17 +00:00
4dabd9c047
merge release@58699 beta-1-14-0@58707 -> release
2007-03-02 21:25:50 +00:00
d4462963c6
merge -r 58503:58641 maintenance -> release
2007-03-02 19:11:06 +00:00
b53c377727
svn merge -r58425:58426 svn+ssh://svn.lindenlab.com/svn/linden/branches/release-candidate into release
2007-03-01 01:30:10 +00:00
568bb88470
Hand-ported svn diff -r58037:58038 svn+ssh://svn.lindenlab.com/svn/linden/branches/release-candidate by changing -megabytes value from 200 to 300. I think that is the only thing that had to happen.
2007-03-01 00:55:31 +00:00
9318da2281
svn merge -r 58437:58503 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
2007-03-01 00:44:07 +00:00
109cd6845b
Mac .dmgs generated by the manifest have upper-case grid names again.
...
Refactored a lot of the command-line options so that it's more self-documenting. Now we have a --help option.
Created a separate action for creating unpackeds, which is not part of the default actions (yet). This should speed up the packaging process. In the process of doing this, I also made sure to enforce the constraint that no actions are performed on the files in the destination directory after the construct method ends. To accomplish this I simply moved some strip method calls up into the construct method.
Lastly, I added our copyright notice to installer_template.nsi, and fixed a reference to a non-existant variable. Hopefully this last won't cause spurious conflicts with Callum's work.
Reviewed by Richard.
Also, the tabs were a little screwed up in the python files, so I untabified and all is good.
2007-02-28 00:16:34 +00:00
b5342e238a
svn merge -r58163:58241 loadstone-sim-standby, reduces database load from standby sims polling the database for a region to run
2007-02-27 17:52:10 +00:00
647d29b1a2
merge -r 58285:58437 maintenance.
2007-02-27 01:03:39 +00:00
c4b5b3977f
svn merge --ignore-ancestry -r 58273:58283 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
...
The diff is basically a no-op since it's a reverse-merge from release itself. However, several things tried to come along for the ride, so I inspected them carefully:
* Reverted libcurl changes which tried to migrate back from maintenance (see r58322)
* Reverted debugging output in lltooldraganddrop.cpp, which had been added then removed again
* Reverted false-positive binary conflict in libgtk-x11-2.0.so
* Reverted false-positive whitespace (?) conflicts in llmail.cpp, and lldataconnector.cpp
* Left a whitespace change in llselectmgr.cpp so there was something to commit
2007-02-24 02:23:22 +00:00
663fff7c3f
svn merge -r 58007:58273 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
2007-02-24 01:47:17 +00:00
bb2b96d6c3
Ported dataserver connectInventory() inventory host name hint code from loadstone-inventory-host-3 which should dramatically reduces read queries against the user table for IM processing. Reviewed by Tess.
2007-02-23 00:48:50 +00:00
b7b4135e55
SL-33966: Viewer installed files are not described in a centralized source
...
This introduces the viewer_manifest.py and associated libraries. Check out https://osiris.lindenlab.com/mediawiki/index.php/Installer_Manifest for some more information.
The gist of it is that all files to be included in the viewer installations are described in viewer_manifest.py. viewer_manifest.py also acts as a packager, if you give it the right options. All of the old methods of packaging (Makefile_Mac, scons, and the various .bat files) still work, but they are mostly just shells for calls to viewer_manifest.py.
You're now required to have python 2.3 or later on your machine to be able to package up an installer, but thankfully most people already have this.
2007-02-21 23:57:35 +00:00
5bdbc85a14
merge QA'd branch fixing SL-35450 Startup crash with non-english locales (linux
...
client)
svn merge svn+ssh://svn.lindenlab.com/svn/linden/release@58131
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/SL-35450-based-on-r58131
2007-02-21 11:13:06 +00:00
7dada07dba
svn merge -r 57620:58007 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
2007-02-20 22:02:36 +00:00
73bc0fb42b
merge -r 56779:58057 /branches/selection_management
2007-02-17 03:02:16 +00:00
12ac04231b
merge -r 57761:57967 im-email-session-3, removes database load from IM to email session tracking, introduces new format for email return addresses
2007-02-15 20:24:08 +00:00
4feabe4a9c
svn merge -r 57708:57906 svn+ssh://svn/svn/linden/branches/don/inventory-dataserver-2
2007-02-13 22:02:38 +00:00
dbcc89b336
Small update to the linux client readme to remove the lack of mozilla
...
embedding from 'known issues'.
2007-02-13 09:49:41 +00:00
d1daa17859
Landing embedded Mozilla support for the Linux Client.
...
svn merge svn+ssh://svn.lindenlab.com/svn/linden/release@57782
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/linuxmozilla-r57782base
2007-02-12 17:20:51 +00:00
5cc44523f7
Result of svn merge -r57350:57790 svn+ssh://svn/svn/linden/branches/os-patches.001 into release.
2007-02-09 23:35:12 +00:00
Josh Bell