summaryrefslogtreecommitdiff
path: root/indra/lscript/lscript_compile/indra.l
AgeCommit message (Collapse)Author
2014-05-07Pull and merge viewer-release as version 3.7.8simon
2013-12-06MAINT-3530 : Add viewer checkbox to extend parcel entry limits to a higher ↵simon
ceiling
2013-10-08merge from viewer-releaseRichard Linden
2013-08-27MAINT-3065 : Avatar render info's 'geometry' stat is unpredictable for ↵simon
linked objects Removed "geometry" and "surface" Reviewed by Kelly
2013-08-19MergeXiaohong Bao
2013-07-30Summer cleaning - removed a lot of llcommon dependencies to speed up build timesRichard Linden
consolidated most indra-specific constants in llcommon under indra_constants.h fixed issues with operations on mixed unit types (implicit and explicit) made LL_INFOS() style macros variadic in order to subsume other logging methods such as ll_infos added optional tag output to error recorders
2013-07-02MAINT-528 added syntax highlighting for STATUS_BLOCK_GRAB_OBJECT and ↵Maestro Linden
corrected related tooltips
2013-07-02MAINT-1260 add missing PRIM_ constants to syntax highlighting. Reviewed by ↵Maestro Linden
Kelly.
2013-06-20Automated merge with http://bitbucket.org/lindenlab/viewer-releaseDave Parks
2013-05-21MAINT-2711 : Add missing LSL constants for llGetObjectDetails() to the viewer.simon
Reviewed by Kelly
2013-05-11Merge vwr-dev-matGraham Madarasz
2013-05-10Put back normal map and spec map initializers/destruction, delete FMOD refs ↵Graham Madarasz
(unneeded with FMODEX), make indra.l/y safe for bison >= 2.7
2013-05-10MAINT-2672 Make windows flex/bison inputs identical to other platforms to ↵Graham Madarasz
make bison >= 2.7 work
2013-05-09Merge downstream code and viewer-betasimon
2013-05-09Merge viewer-betasimon
2013-04-30Merge 3.5.1 into MaterialsGraham Madarasz
2013-04-26Fix linux breakage from sunshine mergeGraham Madarasz
2013-04-22MAINT-2612 fix issues between extern C linkage and yyval ifdefs on Mac with ↵Graham Madarasz
toolchain > 4.5.1
2013-04-19merge changes for DRTVWR-294Oz Linden
2013-04-11Forgot to commit @#! mergesimon
2013-04-11Merge in downstream code (chui fixes, materials)simon
2013-04-11Mergesimon
2013-03-29Update Mac and Windows breakpad builds to latestGraham Madarasz
2013-03-19MAINT-2506 added viewer support for PERMISSION_SILENT_ESTATE_MANAGEMENT and ↵Maestro Linden
PERMISSION_OVERRIDE_ANIMATIONS. Reviewed by Simon.
2013-03-08MAINT-2410 Extra Particle Parameters -- port of Kelly's simulator changesetDave Parks
2012-12-13MAINT-2109 Added ATTACH_NECK and ATTACH_AVATAR_CENTER definitions for LSL ↵Maestro Linden
scripts and script information floater. Reviewed by Andrew.
2012-09-19BUILDFIX: enabling the building of the viewer/appearance backend with ↵Nyx Linden
headless mesa
2012-04-16MAINT-922 FIX Client side code to catch the SCRIPT_PERMISSION_TELEPORT ↵callum
request from similator and display a notification Reviewed by Simon
2011-07-01ER-1016 - "Remove ability for anyone to edit terrain" and ER-910 "Parcelsimon@lindenlab.com
Privacy" changes. Many naming changes for the featureto be "See avatars" instead of "hidden avatars". Also removed the "anyone can edit terrain" checkbox and slammed the value to FALSE.
2011-06-09ER-910: Parcel Privacy. Rename things in code to reflect feature name ↵Dave SIMmONs
change to "hidden avatars"
2011-05-13ER-898: Modify llGetParcelDetails() on viewer to support parcel privacy. ↵Dave SIMmONs
Reviewed by Kelly.
2011-01-20Compile flag for wchar_t, boost 1_45 lib update, indra.l include ordering ↵Mark Palange (Mani)
adjustment
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)