Commit Graph

129 Commits (0d4ecdefa4ac032e2951c8befca0e21d216fd554)

Author SHA1 Message Date
Tank_Master 6207030884 Merge FS LGPL tip 2013-02-23 17:09:53 -08:00
Cinders 2c9e821188 Rename HAS_OPENSIM_SUPPORT switch to OPENSIM 2013-02-18 21:24:20 -07:00
Tank_Master ea86bb88c3 first pass merge 2013-02-04 10:52:32 -08:00
Cinders 4ac7e555e9 Add OSSL/AA syntax highlighting to OpenSim builds 2012-12-13 23:30:24 -07:00
Don Kjer c06c35609c Updating linux build to gcc4.6 2012-10-11 00:09:04 +00:00
Don Kjer 95f3fb45ae Cherry-picked windows build fixes from sunshine-experimental 2012-09-24 19:42:58 +00:00
Nyx Linden 49caededb4 BUILDFIX: enabling the building of the viewer/appearance backend with headless mesa 2012-09-19 17:05:56 +00:00
Ansariel 94ebb25050 Updated LSL syntax highlighting 2012-10-19 09:31:28 +02:00
Ansariel 4b1d3ca444 Added new LSL functions from PF tools merge to LSL editor 2012-08-08 02:45:38 +02:00
callum 3ccda1f285 MAINT-922 FIX Client side code to catch the SCRIPT_PERMISSION_TELEPORT request from similator and display a notification
Reviewed by Simon
2012-04-16 14:29:32 -07:00
Ansariel c5894c2781 Merge with Firestorm LGPL 2012-06-08 22:43:34 +02:00
Ansariel a535dacd42 Added support for user experience LSL functions released with Server RC Magnum 12.05.25.258071 2012-06-02 13:43:38 +02:00
Tank_Master 1c55d5cbb6 Merge LL 3.3.2 release 2012-05-28 17:02:11 -07:00
Ansariel dc62362b70 Updated LSL syntax highlighting for new LSL features on Magnum 12.04.13.253827 RC 2012-04-19 21:09:59 +02:00
Ansariel d156037ca5 Updated LSL syntax highlighting; Fixes FIRE-4697, FIRE-4417, FIRE-4695 2012-01-31 20:05:58 +01:00
Oz Linden f368c858cd correct line endings 2011-08-17 12:09:59 -04:00
simon@lindenlab.com 918238dd18 ER-1016 - "Remove ability for anyone to edit terrain" and ER-910 "Parcel
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-07-01 14:06:08 -07:00
Dave SIMmONs 5039378869 ER-910: Parcel Privacy. Rename things in code to reflect feature name change to "hidden avatars" 2011-06-09 13:46:19 -07:00
Dave SIMmONs 484a4733b7 Merge latest from lindenlab/viewer-development/ 2011-06-08 14:53:00 -07:00
Dave SIMmONs ff3289e2f3 ER-898: Modify llGetParcelDetails() on viewer to support parcel privacy. Reviewed by Kelly. 2011-05-13 13:56:49 -07:00
Don Kjer aeac73e45e Merge with simon's lsl changes 2011-04-02 00:36:04 +00:00
Dave SIMmONs 65d28f8aea Added LSL script functions llGetEnv(), which was missing, and llRegionSayTo(), which is new 2011-04-01 16:42:53 -07:00
Mark Palange (Mani) 60f831151e Compile flag for wchar_t, boost 1_45 lib update, indra.l include ordering adjustment 2011-01-20 11:03:53 -08:00
Leyla Farazha bf4ca3922c DN-141 llGetDisplayName (and other new LSL fucntions) doesn't register (highlight in red) as an internal function in the script editor 2010-11-02 10:47:51 -07:00
Kitty Barnett bef8751bff Merged with RLVa-1.4.3 tip 2011-11-10 23:17:58 +01:00
Arrehn 7394730eaa Merge up to LL FUI 2011-10-28 02:00:09 -04:00
Arrehn e22b5e833f FIRE-3213, Support for newer LSL constants 2011-10-17 21:09:08 -04:00
Arrehn 9fd0edb326 Initial 2.8.3+ merge, Tozh & Arrehn
Issues: Graphics preferences tab, lighting, depth of field
Issues: Color preferences tab, new direct chat
Issues: Build floater Mesh build tab
Issues: German translations of build, viewer menus
Issues: pipeline issues with mac, possibly other things
Issues: uploading content / temp content
Issues: Windlight quickprefs, parcel windlight, RLVa windlight
2011-08-26 11:18:49 -04:00
Arrehn 7cc63ba643 FIRE-1657 Syncronizing lscript_library.cpp to upstream, ahead of next merge. 2011-08-11 12:46:10 -04:00
Arrehn e277b8a4ac Merge with LL 2.6.9, initial work. Needs tests, extra XUI merging with particular skins. 2011-08-04 11:53:40 -04:00
Tozh a398c6d856 Bridge initialization restart and additional logging 2011-06-23 07:53:45 -04:00
Oz Linden 06b0d72efa Change license from GPL to LGPL (version 2.1) 2010-08-13 07:24:57 -04:00
Loren Shih b1b5a11bb0 EXT-3075 : Remove swear words from comments across viewer
This bugs me in a minor way.  Did a search-and-cleanup on various swear words.
2010-03-29 15:33:48 -04:00
Tofu Linden 45ea2bbd1e simpler fix for CID-202 2010-02-13 14:18:04 +00:00
Tofu Linden fa69f09e68 CID-202
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-13 14:15:31 +00:00
Tofu Linden 41bd792032 CID-285
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 17:47:21 +00:00
Tofu Linden 23b1c3d16f CID-286
Checker: UNINIT_CTOR
Function: LLScriptStateChange::LLScriptStateChange(int, int, LLScriptIdentifier *)
File: /indra/lscript/lscript_compile/lscript_tree.h
2010-02-12 17:46:34 +00:00
Tofu Linden 69aa73656e CID-287
Checker: UNINIT_CTOR
Function: LLScriptScript::LLScriptScript(LLScritpGlobalStorage *, LLScriptState *)
File: /indra/lscript/lscript_compile/lscript_tree.cpp
2010-02-12 17:43:47 +00:00
Paul Guslisty 86d8d35341 Fixed linux build
--HG--
branch : product-engine
2009-12-10 18:08:07 +02:00
angela b6ad65c04e EXT-2094 Add click-to-zoom as a one-click settable option for objects 2009-11-19 15:02:05 +08:00
angela a35fbddb91 EXT-2094 2009-11-18 20:52:53 +08:00
Mark Palange (Mani) 4d53e235c2 merge of latest viewer/viewer-20 2009-10-02 10:35:42 -07:00
Mark Palange (Mani) dde2153014 merge of latest lindenlab/svn-imports-viewer-20 2009-10-01 18:19:45 -07:00
Monroe Williams 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
Nat Goodspeed eca30a2262 QAR-1619: merge up to 2009-09-26 viewer/viewer-20 2009-09-30 21:42:04 -04:00
Nat Goodspeed bc4444cd78 Merge into viewer/viewer-20 yesterday's lindenlab/svn-imports-viewer-20 2009-09-26 18:08:24 -04:00
brad kittenbrink bb1d4592bd Merged latest viewer/viewer-20 into login-api. 2009-09-18 15:22:25 -04:00
Martin Reddy 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
brad kittenbrink 0f0853a6fe Fix up some more post-merge breakage. 2009-09-01 18:16:04 -04:00
brad kittenbrink bae94e4340 Merged login-api with viewer-2.0.0-3 up through r132290. 2009-09-01 12:21:51 -04:00