cf9239cabc
svn merge -r 134922:134973 svn+ssh://svn.lindenlab.com/svn/linden/branches/media-on-a-prim/moap-7
...
Merging branches/media-on-a-prim/moap-7 down to viewer-2.0.
2009-10-01 02:35:53 +00:00
387bf672f3
DEV-31898: merging the fix for this bug into viewer-2.0.0-3 so that it
...
will be available in our next public release. The server part of the
fix missed 1.30, but should (hopefully) get into 1.32.
Original fix was reviewed by soft and kelly.
2009-09-16 12:59:13 +00:00
aa2b978bf5
merge -r 112783:112799 linden/branches/kelly/lsl-http-in-merge to linden/trunk
2009-02-24 19:29:36 +00:00
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
b9b4a4d934
QAR-782 Merge featurettes batch #2
...
merge featurettes-6-merge-2 -> release
dataserver-is-deprecated
2008-08-13 19:37:05 +00:00
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
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
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
ba607fe406
QAR-345 merge windlight scriptglow3 into release
...
Qarl's viewer and simulator patch to add glow functionality to
llGetPrimitiveParams/llSetPrimitiveCommands
svn merge -r 81743:81787 svn+ssh://svn.lindenlab.com/svn/linden/branches/merge_scriptglow3_r81714
2008-03-10 16:32:21 +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
b3d807d5ff
svn merge -r 68690:69597 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-3-Viewer --> release
...
Merge patches made in the 1-18-3 RC iterations into the trunk.
NOTE: Includes the reversion of SL-51274 (originally maintenance r67559, changed lltracker.cpp)
2007-09-13 18:17:52 +00:00
ef32d1d6b0
merge -r66262:66263 linden/branches/kelly/llgetobjectdetails-2
2007-07-26 16:51:08 +00:00
029130bf9c
svn merge svn+ssh://svn.lindenlab.com/svn/linden/release@62339 svn+ssh://svn.lindenlab.com/svn/linden/branches/release-candidate62341 -> release
2007-05-23 21:17:34 +00:00
5e9e67cb2d
merge -r 59028:59178 maintenance -> release.
2007-03-16 20:39:40 +00:00
420b91db29
Print done when done.
2007-01-02 08:33:20 +00:00
Monroe Williams