Age | Commit message (Collapse) | Author |
|
svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
(only inside indra)
(josh) Original log message was:
svn merge -r64837:65485 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
bos updated it to be:
svn merge -r64837:65269 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
However, it appears it actually was:
svn merge -r64837:65485 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
... missing some file additions.
|
|
into release
|
|
svn+ssh://svn.lindenlab.com/svn/linden/branches/release-candidate@59163 --> release
|
|
svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
|
|
svn+ssh://svn/svn/linden/branches/don/inventory-dataserver-2
|
|
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.
|
|
|