52562e2e66
svn merge -r92720:92721 svn+ssh://svn.lindenlab.com/svn/linden/branches/uv-picking-merge
...
QAR-698 / DEV-9985 add touch "position" information to touch-events in LSL
2008-07-23 21:20:19 +00:00
35b4a91129
svn merge -r92710:92709 svn+ssh://svn.lindenlab.com/svn/linden/release --> release
...
Undo r92710 (for QAR-698) - went straight into release instead of a side branch for validation.
2008-07-22 20:55:02 +00:00
df4f20d4f5
merge uv-picking branch.
...
svn merge -r92602:92632 svn+ssh://svn.lindenlab.com/svn/linden/branches/uv-picking-4
2008-07-22 20:12:37 +00:00
25c10ed028
QAR-628 merge string-cleanup-5 -r 90476:90508 -> release
...
dataserver-is-deprecated
2008-06-26 00:39:00 +00:00
580f9088b4
svn merge -r90394:90492 svn/branches/havok4/qar-689 --> release
...
QAR-689 - branch/havok4/havok4-7 r89805 is ready for merge back into release
2008-06-25 16:22:00 +00:00
dc48f1c741
svn merge -r83872:83893 linden/branches/Branch_1-20-0-Server to linden/release
...
HAVOK4 IN TEH HOUSE!!11!!ONE!!
If it is broken blame Joel for not fixing the loginassetdatabaseinventorygroupIM server instead of working on this.
QAR-448
2008-04-03 22:50:22 +00:00
5595a99623
Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code.
2007-10-04 23:19:43 +00:00
4dabd9c047
merge release@58699 beta-1-14-0@58707 -> release
2007-03-02 21:25:50 +00:00
f27ef7c31a
Removed the #ifndef NO_RTTI hack.
...
Moved the LLSD related methods of LLVector3 to NOT be inline, as per MarkL's suggestion.
2007-02-07 21:58:58 +00:00
420b91db29
Print done when done.
2007-01-02 08:33:20 +00:00
Karl Steifvater