summaryrefslogtreecommitdiff
path: root/indra/lscript/lscript_compile/indra.l
AgeCommit message (Collapse)Author
2009-11-19 EXT-2094 Add click-to-zoom as a one-click settable option for objectsangela
2009-11-18EXT-2094angela
2009-10-01svn merge -r 134922:134973 ↵Monroe Williams
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-09-16DEV-31898: merging the fix for this bug into viewer-2.0.0-3 so that itMartin Reddy
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-02-24merge -r 112783:112799 linden/branches/kelly/lsl-http-in-merge to linden/trunkKelly Washington
2008-12-04Merging from server/server-1.25 back to trunk.Robert Knop
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-09-12QAR-855 Viewer 1.21 RC 2Steven Bennetts
merge viewer_1-21 94770-96059 -> release
2008-08-13QAR-782 Merge featurettes batch #2Steven Bennetts
merge featurettes-6-merge-2 -> release dataserver-is-deprecated
2008-07-31svn merge -r93014:93396 ↵Dave Hiller
svn+ssh://svn.lindenlab.com/svn/linden/branches/mono-r93014-qar633 dataserver-is-deprecated
2008-06-27QAR-669 1.20 Viewer RC11Steven Bennetts
QAR-648 1.20 Viewer RC10 merge Branch_1-20-Viewer-2 -r 88724:90511 -> release
2008-06-26QAR-628 merge string-cleanup-5 -r 90476:90508 -> releaseSteven Bennetts
dataserver-is-deprecated
2008-06-02svn merge -r88066:88786 ↵Bryan O'Sullivan
svn+ssh://svn.lindenlab.com/svn/linden/branches/cmake-9-merge dataserver-is-deprecated for-fucks-sake-whats-with-these-commit-markers
2008-05-11QAR-566 maint-viewer-5-merge-2Steven Bennetts
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-08QAR-570 maint-render-4 mergeSteven Bennetts
merge -r 87067:87077 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-render/maint-render-4-merge -> release. dataserver-is-deprecated.
2008-04-30Workaround for cygwin flex 2.5.35 bug.Steven Bennetts
Reviewed by Phoenix
2008-03-10QAR-345 merge windlight scriptglow3 into releaseBrad Kittenbrink
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-02-14svn merge -r 79730:79944 ↵Josh Bell
svn+ssh://svn.lindenlab.com/svn/linden/branches/parcel_media/sl-parcelmedia-6 --> release QAR-275 Parcel Media Sam made me do it.
2007-11-20Reverting accidental changes from age-verification merge (only affects vc8 ↵Steven Bennetts
build)
2007-11-15merge of age verification changes from QAR-76 to release; changes were ↵Kent Quirk
originally made on the age_verification_2007xxxx branches; final changes were QA'd on age_verification_20071112.
2007-11-08Reverting unintentional commit of indra.lSteven Bennetts
2007-11-07Removied viewer.h from macview_prefix.hSteven Bennetts
2007-11-05merge -r71488:71881 ↵Karl Steifvater
svn+ssh://svn.lindenlab.com/svn/linden/branches/flex-bison --> release
2007-10-04Result of svn merge -r70873:71086 ↵Aaron Brashears
svn+ssh://svn/svn/linden/branches/enable-exceptions into release.
2007-09-13svn merge -r 68690:69597 ↵Josh Bell
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-07-26merge -r66262:66263 linden/branches/kelly/llgetobjectdetails-2Kelly Washington
2007-07-26EFFECTIVE MERGE: svn merge -r 65485:66133 ↵Don Kjer
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-20svn merge -r 64548:64837 svn+ssh://svn/svn/linden/branches/maintenance into ↵Don Kjer
release * WARNING *: maintenance r64837 is not the last rev to use in the next merge. use r65269
2007-07-12svn merge -r65092:65220 ↵Bryan O'Sullivan
svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance-r64837
2007-06-21merge -r62831:64079 branches/maintenance to releaseKelly Washington
2007-06-04svn merge -r 62602:62831 ↵Josh Bell
svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
2007-05-23svn merge svn+ssh://svn.lindenlab.com/svn/linden/release@62339 ↵Brad Kittenbrink
svn+ssh://svn.lindenlab.com/svn/linden/branches/release-candidate62341 -> release
2007-03-16merge -r 59028:59178 maintenance -> release.Steven Bennetts
2007-01-02Print done when done.James Cook
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-28 21:31:19 +0000