| Age | Commit message (Collapse) | Author |
|---|
|
svn+ssh://svn.lindenlab.com/svn/linden/branches/release-candidate (into release)
Port of fix for SL-35327 which was fixed in release-candidate.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
svn+ssh://svn.lindenlab.com/svn/linden/branches/release-candidate into release
|
|
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.
|
|
svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
|
|
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.
|
|
standby sims polling the database for a region to run
|
|
|
|
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
|
|
svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
|
|
loadstone-inventory-host-3 which should dramatically reduces read queries against the user table for IM processing. Reviewed by Tess.
|
|
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.
|
|
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
|
|
svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
|
|
|
|
email session tracking, introduces new format for email return addresses
|
|
svn+ssh://svn/svn/linden/branches/don/inventory-dataserver-2
|
|
embedding from 'known issues'.
|
|
svn merge svn+ssh://svn.lindenlab.com/svn/linden/release@57782
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/linuxmozilla-r57782base
|
|
svn+ssh://svn/svn/linden/branches/os-patches.001 into release.
|
|
was no longer included in lluuid.h. This fix was found by James and I verified it.
|
|
Moved the LLSD related methods of LLVector3 to NOT be inline, as per MarkL's suggestion.
|
|
to link.
I added a #ifndef hack to v3math.h to eliminate LLString's from the llhavok project.
I also removed lluuid.h's dependency on LLString (using std::string) instead and
then fixed a bunch of bad dependency fallout on a few files around the project
that suddenly lost their hidden access to some fundamental includes.
The important parts were reviewed with James.
|
|
concludes (fixes) SL-31187
pair programmed and reviewed by markl and karen
|
|
|
|
|
|
svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-13-3
svn merge -r 57565:57604 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-13-3
(skips 57565, a merge from release. being picky.)
Pick up fixes for:
* Offer Teleport in profiles
* Setting 'none' group
* agni_check_parcel_auctions exception (pushed live already)
|
|
svn+ssh://svn/svn/linden/branches/adroit.r40-68 into release.
|
|
makes it clear
we still are enforcing our trademarks
|
|
|
|
files.
|
|
|
|
|
|
|
|
svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
|
|
|
|
we establish trust between dataserver and simulator explicitly on startup, reviewed by Kelly.
|
|
commands not putting transaction ids into a packet. Reviewed with Kelly.
|
|
svn+ssh://svn/svn/linden/branches/more-random into release.
|
|
|
|
|
|
teleporting with capabilities turned on" from Branch 1-13-2 r56710 via partial merge of release-candidate -r 56743:56744
|
|
svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
|
|
merge -r 56301 release-candidate
Fixes for llxfer.cpp and llaudiodecodemgr.cpp (asset upload truncation bug)
llxfer.cpp got missed somehow the first time round, grr!
|
|
merge -r 56301 release-candidate
Fixes for llxfer.cpp and llaudiodecodemgr.cpp (asset upload truncation bug)
|
