Age | Commit message (Collapse) | Author | |
---|---|---|---|
2013-06-20 | Automated merge with http://bitbucket.org/lindenlab/viewer-release | Dave Parks | |
2013-05-11 | Merge vwr-dev-mat | Graham Madarasz | |
2013-05-10 | Put 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-09 | Merge viewer-beta | simon | |
2013-04-30 | Merge 3.5.1 into Materials | Graham Madarasz | |
2013-04-26 | Fix linux breakage from sunshine merge | Graham Madarasz | |
2013-04-19 | merge changes for DRTVWR-294 | Oz Linden | |
2013-04-11 | Forgot to commit @#! merge | simon | |
2013-03-29 | Update Mac and Windows breakpad builds to latest | Graham Madarasz | |
2012-12-13 | MAINT-2109 Added ATTACH_NECK and ATTACH_AVATAR_CENTER definitions for LSL ↵ | Maestro Linden | |
scripts and script information floater. Reviewed by Andrew. | |||
2012-10-11 | Updating linux build to gcc4.6 | Don Kjer | |
2012-09-24 | Cherry-picked windows build fixes from sunshine-experimental | Don Kjer | |
2012-09-19 | BUILDFIX: enabling the building of the viewer/appearance backend with ↵ | Nyx Linden | |
headless mesa | |||
2012-04-16 | MAINT-922 FIX Client side code to catch the SCRIPT_PERMISSION_TELEPORT ↵ | callum | |
request from similator and display a notification Reviewed by Simon | |||
2011-08-17 | correct line endings | Oz Linden | |
2011-07-01 | ER-1016 - "Remove ability for anyone to edit terrain" and ER-910 "Parcel | simon@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-09 | ER-910: Parcel Privacy. Rename things in code to reflect feature name ↵ | Dave SIMmONs | |
change to "hidden avatars" | |||
2011-05-13 | ER-898: Modify llGetParcelDetails() on viewer to support parcel privacy. ↵ | Dave SIMmONs | |
Reviewed by Kelly. | |||
2011-01-20 | Compile flag for wchar_t, boost 1_45 lib update, indra.l include ordering ↵ | Mark Palange (Mani) | |
adjustment | |||
2010-08-13 | Change license from GPL to LGPL (version 2.1) | Oz Linden | |
2010-02-13 | simpler fix for CID-202 | Tofu Linden | |
2010-02-13 | CID-202 | Tofu 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-12 | CID-285 | Tofu 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-12 | CID-286 | Tofu Linden | |
Checker: UNINIT_CTOR Function: LLScriptStateChange::LLScriptStateChange(int, int, LLScriptIdentifier *) File: /indra/lscript/lscript_compile/lscript_tree.h | |||
2010-02-12 | CID-287 | Tofu Linden | |
Checker: UNINIT_CTOR Function: LLScriptScript::LLScriptScript(LLScritpGlobalStorage *, LLScriptState *) File: /indra/lscript/lscript_compile/lscript_tree.cpp | |||
2009-11-19 | EXT-2094 Add click-to-zoom as a one-click settable option for objects | angela | |
2009-11-18 | EXT-2094 | angela | |
2009-10-01 | merge of latest lindenlab/svn-imports-viewer-20 | Mark Palange (Mani) | |
2009-10-01 | svn 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-26 | Merge into viewer/viewer-20 yesterday's lindenlab/svn-imports-viewer-20 | Nat Goodspeed | |
2009-09-16 | DEV-31898: merging the fix for this bug into viewer-2.0.0-3 so that it | Martin 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-08-31 | Merge with trunk | Bryan O'Sullivan | |
2009-08-29 | Partial 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-07-15 | svn merge -r126867:127217 svn+ssh://svn.lindenlab.com/svn/user/cg/qar-1691 | Christian Goetze | |
Effective merge: svn merge -r125827:127126 svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.27 QAR-1691 | |||
2009-07-01 | svn merge -r125825:125901 svn+ssh://svn.lindenlab.com/svn/user/cg/qar-1654 | Christian Goetze | |
QAR-1654 merge completed. | |||
2009-04-16 | svn merge -r117314:117337 | Adam Moss | |
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/mv13a-merge-1 QAR-1343 maint-viewer-13a+libcurlexploitfix-3-3 combo merge | |||
2009-02-24 | merge -r 112783:112799 linden/branches/kelly/lsl-http-in-merge to linden/trunk | Kelly Washington | |
2009-01-08 | Result of svn merge -r107256:107258 ↵ | Aaron Brashears | |
svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 | |||
2008-12-04 | Merging 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-10-31 | Fix more silly printf crasher holes | Bryan O'Sullivan | |
2008-10-01 | svn merge -r96886:98039 ↵ | Christian Goetze | |
svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-24-Server --> release | |||
2008-09-12 | QAR-855 Viewer 1.21 RC 2 | Steven Bennetts | |
merge viewer_1-21 94770-96059 -> release | |||
2008-08-13 | QAR-782 Merge featurettes batch #2 | Steven Bennetts | |
merge featurettes-6-merge-2 -> release dataserver-is-deprecated | |||
2008-07-31 | svn merge -r93014:93396 ↵ | Dave Hiller | |
svn+ssh://svn.lindenlab.com/svn/linden/branches/mono-r93014-qar633 dataserver-is-deprecated | |||
2008-07-27 | Explicitly mark the generated files with the GENERATED property to make sure ↵ | Kyle McKay | |
CMake handles them correctly | |||
2008-06-27 | QAR-669 1.20 Viewer RC11 | Steven Bennetts | |
QAR-648 1.20 Viewer RC10 merge Branch_1-20-Viewer-2 -r 88724:90511 -> release | |||
2008-06-26 | QAR-628 merge string-cleanup-5 -r 90476:90508 -> release | Steven Bennetts | |
dataserver-is-deprecated | |||
2008-06-02 | svn 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-11 | QAR-566 maint-viewer-5-merge-2 | Steven 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-08 | QAR-570 maint-render-4 merge | Steven Bennetts | |
merge -r 87067:87077 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-render/maint-render-4-merge -> release. dataserver-is-deprecated. |