Age | Commit message (Collapse) | Author |
|
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)
|
|
svn+ssh://svn.lindenlab.com/svn/linden/branches/abstract-kdu@56647 --ignore-ancestry
|
|
svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
|
|
svn merge -r 56564:56570 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
NOTE: This skips -r 56560:56464 which should be merged after being QA'd
|
|
svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
|
|
svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-13-1
Reviewed by doug. This code is running on Agni, but needed to merge into doug's new nightly stuff.
|
|
Add floss exception doc
|
|
svn+ssh://svn/svn/linden/branches/llscene-shuffle into release.
|
|
svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance@56431
This turned up the following "lost" changes:
llapp.cpp (from maintenance r55371) - SIGPIPE fix, possibly
llfontgl.cpp (from maintenance r50207) - whitespace only
inventorybridge.cpp (property - non-executable)
skins/xui/*/* (from maintenance r55380) - XML processing instruction went AWOL
|
|
Darwin release.
|
|
useful. no code changes. SL-13762
|
|
Picking up some interestlist cleanup that passed testing.
|
|
|