Dave Parks
|
764412f9b5
|
merge
|
2011-04-22 11:50:19 -05:00 |
|
Brad Payne (Vir Linden)
|
d381ec4209
|
SH-915 WIP - removed coupling between autopilot flycam and joystick flycam
|
2011-02-11 13:19:49 -05:00 |
|
Brad Payne (Vir Linden)
|
49b8f8af02
|
SH-915 WIP - LLAgentPilot class cleanup, added interpolation for camera motion
|
2011-02-10 15:57:08 -05:00 |
|
Brad Payne (Vir Linden)
|
54bf80bf45
|
SH-915 WIP - cleanup
|
2011-02-09 18:23:30 -05:00 |
|
Brad Payne (Vir Linden)
|
3ae3a4a6cb
|
SH-915 WIP - support pilot.xml with extended camera info
|
2011-02-09 17:07:13 -05:00 |
|
Brad Payne (Vir Linden)
|
64e017fc6b
|
SH-915 WIP - allow flycam control in autopilot record/playback
|
2011-02-09 15:04:25 -05:00 |
|
Brad Payne (Vir Linden)
|
04ddae45b2
|
SH-872 WIP - restored log statements, as removing them had no effect
|
2011-02-03 17:52:45 -05:00 |
|
Loren Shih
|
293b35f000
|
Automated merge from mesh-development
|
2011-02-01 11:16:43 -05:00 |
|
Brad Payne (Vir Linden)
|
7205ad6d53
|
SH-872 WIP - temporarily disabling problematic log output to see if that fixes crash on test machine
|
2011-01-31 18:03:39 -05:00 |
|
Oz Linden
|
a5619d16f7
|
correct licenses (fix problem with license change merge)
|
2010-10-13 07:24:37 -04:00 |
|
Oz Linden
|
06b0d72efa
|
Change license from GPL to LGPL (version 2.1)
|
2010-08-13 07:24:57 -04:00 |
|
Steven Bennetts
|
9ec432034d
|
merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3
ignore-dead-branch
|
2009-06-21 08:04:56 +00:00 |
|
Aaron Brashears
|
e3cf284388
|
Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165
|
2009-01-08 00:05:06 +00:00 |
|
Steven Bennetts
|
25c10ed028
|
QAR-628 merge string-cleanup-5 -r 90476:90508 -> release
dataserver-is-deprecated
|
2008-06-26 00:39:00 +00:00 |
|
Don Kjer
|
3855896097
|
EFFECTIVE MERGES:
svn merge -r 79616:82632 svn+ssh://svn/svn/linden/branches/maintenance/maintenance-7 into release
svn merge -r 83211:87215 svn+ssh://svn/svn/linden/branches/php-framework-3 into release
ACTUAL MERGE: svn merge -r 87631:87698 svn+ssh://svn/svn/linden/qa/combo-merge-maintenance-7-php-framework-3 into release
dataserver-is-deprecated
|
2008-05-19 17:02:33 +00:00 |
|
Brian McGroarty
|
d273ba2ce2
|
Back out QAR-520 maintenance-7 merge -- svn merge -r 86947:86946 svn+ssh://svn.lindenlab.com/svn/linden/release dataserver-is-deprecated
|
2008-05-07 20:48:38 +00:00 |
|
Brian McGroarty
|
e1e1212daa
|
QAR-520 maintenance-7 merge -- svn merge -r 84923:86093 svn+ssh://svn.lindenlab.com/svn/linden/qa/maintenance-7-sandbox-84884 -- dataserver-is-deprecated
|
2008-05-07 17:17:42 +00:00 |
|
Steven Bennetts
|
050dad0ce3
|
merge svn+ssh://steve@svn/svn/linden/branches/viewer-cleanup-3 -r 73026:73079
|
2007-11-07 22:55:27 +00:00 |
|
Aaron Brashears
|
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 |
|
Aaron Brashears
|
305c74d516
|
Result of svn merge -r57264:57370 svn+ssh://svn/svn/linden/branches/adroit.r40-68 into release.
|
2007-02-02 17:28:58 +00:00 |
|
James Cook
|
420b91db29
|
Print done when done.
|
2007-01-02 08:33:20 +00:00 |