b6ad65c04e
EXT-2094 Add click-to-zoom as a one-click settable option for objects
2009-11-19 15:02:05 +08:00
a35fbddb91
EXT-2094
2009-11-18 20:52:53 +08:00
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
189599b6ff
Merging from server/server-1.25 back to trunk.
...
svn merge -r99446:104838 svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.25
Conflicts resolved by Prospero, except for one scary conflict in
SendConfirmationEmail.php which was resolved by jarv.
2008-12-04 22:36:34 +00:00
da94c0eaa2
QAR-855 Viewer 1.21 RC 2
...
merge viewer_1-21 94770-96059 -> release
2008-09-12 06:27:13 +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
9a7d68cfce
svn merge -r93014:93396 svn+ssh://svn.lindenlab.com/svn/linden/branches/mono-r93014-qar633 dataserver-is-deprecated
2008-07-31 12:15:15 +00:00
926ea0b39a
QAR-669 1.20 Viewer RC11
...
QAR-648 1.20 Viewer RC10
merge Branch_1-20-Viewer-2 -r 88724:90511 -> release
2008-06-27 21:02:01 +00:00
25c10ed028
QAR-628 merge string-cleanup-5 -r 90476:90508 -> release
...
dataserver-is-deprecated
2008-06-26 00:39:00 +00:00
9db949eec3
svn merge -r88066:88786 svn+ssh://svn.lindenlab.com/svn/linden/branches/cmake-9-merge
...
dataserver-is-deprecated
for-fucks-sake-whats-with-these-commit-markers
2008-06-02 21:14:31 +00:00
875606a04d
QAR-566 maint-viewer-5-merge-2
...
Effective merge: release@84102 maint-viewer-5@86348 -> maint-viewer-5-merge-2
Actual merge maint-viewer-5-merge-2 -r 87239 : 87246 -> release
2008-05-11 20:56:42 +00:00
63e7894148
QAR-570 maint-render-4 merge
...
merge -r 87067:87077 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-render/maint-render-4-merge -> release. dataserver-is-deprecated.
2008-05-08 18:41:20 +00:00
cf2a96375f
Workaround for cygwin flex 2.5.35 bug.
...
Reviewed by Phoenix
2008-04-30 22:45:41 +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
98fd90ddd6
svn merge -r 79730:79944 svn+ssh://svn.lindenlab.com/svn/linden/branches/parcel_media/sl-parcelmedia-6 --> release
...
QAR-275 Parcel Media
Sam made me do it.
2008-02-14 01:45:59 +00:00
9a85f0d0bd
Reverting accidental changes from age-verification merge (only affects vc8 build)
2007-11-20 03:42:06 +00:00
138bf17c3c
merge of age verification changes from QAR-76 to release; changes were originally made on the age_verification_2007xxxx branches; final changes were QA'd on age_verification_20071112.
2007-11-15 19:10:29 +00:00
0771e39d20
Reverting unintentional commit of indra.l
2007-11-08 00:16:19 +00:00
424af0690a
Removied viewer.h from macview_prefix.h
2007-11-07 23:15:09 +00:00
6fd04521d7
merge -r71488:71881 svn+ssh://svn.lindenlab.com/svn/linden/branches/flex-bison --> release
2007-11-05 19:51:45 +00:00
4942a7b779
Result of svn merge -r70873:71086 svn+ssh://svn/svn/linden/branches/enable-exceptions into release.
2007-10-04 16:31:48 +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
9746cf5310
EFFECTIVE MERGE: svn merge -r 65485:66133 svn+ssh://svn/svn/linden/branches/maintenance into release
...
This includes fixes to the maintenance-r66133 branch, and sync'ing up with release@r66392
ACTUAL MERGE: svn merge -r 66394:66435 svn+ssh://svn/svn/linden/branches/release-r66392 into release
EQUIVALENT TO: svn merge -r 65485:66434 svn+ssh://svn/svn/linden/branches/maintenance-r66133 into release (plus branch sync'ing)
2007-07-26 01:22:23 +00:00
d373dcc7cb
svn merge -r 64548:64837 svn+ssh://svn/svn/linden/branches/maintenance into release
...
* WARNING *: maintenance r64837 is not the last rev to use in the next merge. use r65269
2007-07-20 20:38:05 +00:00
42f7199fdb
svn merge -r65092:65220 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance-r64837
2007-07-12 22:18:34 +00:00
e03bb0606a
merge -r62831:64079 branches/maintenance to release
2007-06-21 22:40:22 +00:00
e61a10ec5b
svn merge -r 62602:62831 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
2007-06-04 18:46:59 +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
angela