summaryrefslogtreecommitdiff
path: root/indra/lscript
AgeCommit message (Collapse)Author
2013-04-12Fix merge odditiessimon
2013-04-11Merge in downstream code (chui fixes, materials)simon
2013-04-11Mergesimon
2013-03-19MAINT-2506 added viewer support for PERMISSION_SILENT_ESTATE_MANAGEMENT and ↵Maestro Linden
PERMISSION_OVERRIDE_ANIMATIONS. Reviewed by Simon.
2013-03-13MergeDave Parks
2013-03-12Mods to make compile on gcc 4.6.3 work mo bettaGraham Madarasz
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-10-11Updating linux build to gcc4.6Don Kjer
2012-09-24Cherry-picked windows build fixes from sunshine-experimentalDon Kjer
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-08-17correct line endingsOz Linden
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-06-08Merge latest from lindenlab/viewer-development/Dave SIMmONs
2011-05-13ER-898: Modify llGetParcelDetails() on viewer to support parcel privacy. ↵Dave SIMmONs
Reviewed by Kelly.
2011-04-02Merge with simon's lsl changesDon Kjer
2011-04-01Added LSL script functions llGetEnv(), which was missing, and ↵Dave SIMmONs
llRegionSayTo(), which is new
2011-01-20Compile flag for wchar_t, boost 1_45 lib update, indra.l include ordering ↵Mark Palange (Mani)
adjustment
2010-11-02DN-141 llGetDisplayName (and other new LSL fucntions) doesn't register ↵Leyla Farazha
(highlight in red) as an internal function in the script editor
2010-08-13Change license from GPL to LGPL (version 2.1)Oz Linden
2010-03-29EXT-3075 : Remove swear words from comments across viewerLoren Shih
This bugs me in a minor way. Did a search-and-cleanup on various swear words.
2010-02-13simpler fix for CID-202Tofu Linden
2010-02-13CID-202Tofu Linden
Checker: REVERSE_INULL Function: LLScriptEventHandler::recurse(_iobuf *, int, int, e_lscript_compile_pass, e_lscript_prune_type, int &, LLScriptScope *, e_lscript_types &, e_lscript_types, unsigned long long &, LLScriptByteCodeChunk *, LLScriptByteCodeChunk *, int, LLScriptScopeEntry *, int, LLScriptLibData **)
2010-02-12CID-285Tofu Linden
Checker: UNINIT_CTOR Function: LLScriptState::LLScriptState(int, int, e_lscript_state_type, LLScriptIdentifier *, LLScriptEventHandler *) File: /indra/lscript/lscript_compile/lscript_tree.h
2010-02-12CID-286Tofu Linden
Checker: UNINIT_CTOR Function: LLScriptStateChange::LLScriptStateChange(int, int, LLScriptIdentifier *) File: /indra/lscript/lscript_compile/lscript_tree.h
2010-02-12CID-287Tofu Linden
Checker: UNINIT_CTOR Function: LLScriptScript::LLScriptScript(LLScritpGlobalStorage *, LLScriptState *) File: /indra/lscript/lscript_compile/lscript_tree.cpp
2009-12-10Fixed linux buildPaul Guslisty
--HG-- branch : product-engine
2009-11-19 EXT-2094 Add click-to-zoom as a one-click settable option for objectsangela
2009-11-18EXT-2094angela
2009-10-02merge of latest viewer/viewer-20Mark Palange (Mani)
2009-10-01merge of latest lindenlab/svn-imports-viewer-20Mark Palange (Mani)
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-30QAR-1619: merge up to 2009-09-26 viewer/viewer-20Nat Goodspeed
2009-09-26Merge into viewer/viewer-20 yesterday's lindenlab/svn-imports-viewer-20Nat Goodspeed
2009-09-18Merged latest viewer/viewer-20 into login-api.brad kittenbrink
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-09-01Fix up some more post-merge breakage.brad kittenbrink
2009-09-01Merged login-api with viewer-2.0.0-3 up through r132290.brad kittenbrink
2009-08-31Merge with trunkBryan O'Sullivan
2009-08-29Partial merge of: viewer-2.0.0-3@131138 texture-pipeline-3@131862 -> ↵Steven Bennetts
viewer-2.0.0-3 Includes: * DEV-31909 VWR-13251: Revise lscript_library.cpp to allow localization of LSL editor hovertips * DEV-21938 llSHA1String does not appear where expected in the dropdown "Insert" menu in the LSL editor * Some cleanup to llerror so that it doesn't depend on llfixedbuffer * A few misc. server specific changes not related to the texture-pipeline changes (llapp, lloptioninterface)
2009-08-27Merged latest login-api with latest viewer-2.0.0-3 up through plugin-api-05 ↵brad kittenbrink
merge (r131929). Some minor post-merge cleanups still required.
2009-08-24merge -r 130399-131510 skinning-21 -> viewer-2.0.0-3Richard Nelson
DEV-11254 DEV-11254 DEV-2003: DEV-21567 DEV-37301 EXT-104 EXT-138 EXT-217 EXT-256 EXT-259 EXT-259 EXT-328 EXT-348 EXT-386 EXT-399 EXT-403 EXT-460 EXT-492 EXT-492 EXT-531 EXT-537 EXT-684 improved text editor (handles multiple fonts simultaneously as well as inline widgets)
2009-07-15svn merge -r126867:127217 svn+ssh://svn.lindenlab.com/svn/user/cg/qar-1691Christian Goetze
Effective merge: svn merge -r125827:127126 svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.27 QAR-1691
2009-07-01svn merge -r125825:125901 svn+ssh://svn.lindenlab.com/svn/user/cg/qar-1654Christian Goetze
QAR-1654 merge completed.
2009-06-21merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3Steven Bennetts
ignore-dead-branch
2009-05-22DEV-27646 dll linkage for login module.Brad Kittenbrink
Ok, finally got this to a point where it doesn't break the build and I can check in. llcommon can be built as a shared library (disabled but can be enabled with cmake cache var LLCOMMON_LINK_SHARED. reviewed by Mani on tuesday (I still need to get his suggested changes re-reviewed)
2009-05-08merge trunk@116587 skinning-7@119389 -> viewer-2.0.0-skinning-7Steven Bennetts
2009-04-16svn merge -r117314:117337Adam Moss
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/mv13a-merge-1 QAR-1343 maint-viewer-13a+libcurlexploitfix-3-3 combo merge