Commit Graph

84 Commits (4e0d3bdd4da2bf376bf482f4430e05ba8a6fa01c)

Author SHA1 Message Date
simon 5bef957159 MAINT-3530 : Add viewer checkbox to extend parcel entry limits to a higher ceiling 2013-12-06 15:44:18 -08:00
simon dc54af030e MAINT-3065 : Avatar render info's 'geometry' stat is unpredictable for linked objects
Removed "geometry" and "surface"  Reviewed by Kelly
2013-08-27 14:57:43 -07:00
Maestro Linden e589f47e5e MAINT-528 added syntax highlighting for STATUS_BLOCK_GRAB_OBJECT and corrected related tooltips 2013-07-02 18:41:03 +00:00
Maestro Linden ccc8577798 MAINT-1260 add missing PRIM_ constants to syntax highlighting. Reviewed by Kelly. 2013-07-02 17:59:43 +00:00
simon 8a16b55bf8 MAINT-2711 : Add missing LSL constants for llGetObjectDetails() to the viewer.
Reviewed by Kelly
2013-05-21 09:11:50 -07:00
Graham Madarasz 5717bcf4ae MAINT-2672 Make windows flex/bison inputs identical to other platforms to make bison >= 2.7 work 2013-05-10 12:15:25 -07:00
simon ee2fce8790 Merge downstream code and viewer-beta 2013-05-09 14:10:45 -07:00
simon c7f7c4bc4d Merge viewer-beta 2013-05-09 13:14:49 -07:00
Graham Madarasz 4bd3fef6f7 MAINT-2612 fix issues between extern C linkage and yyval ifdefs on Mac with toolchain > 4.5.1 2013-04-22 13:29:33 -07:00
Oz Linden ddd5659f81 merge changes for DRTVWR-294 2013-04-19 10:11:29 -04:00
simon 066f2acadf Forgot to commit @#! merge 2013-04-11 16:23:36 -07:00
simon b42b789723 Merge in downstream code (chui fixes, materials) 2013-04-11 16:18:34 -07:00
simon c7bab8ab8b Merge 2013-04-11 16:04:21 -07:00
Graham Madarasz bf6182daa8 Update Mac and Windows breakpad builds to latest 2013-03-29 07:50:08 -07:00
Maestro Linden a8245c51b9 MAINT-2506 added viewer support for PERMISSION_SILENT_ESTATE_MANAGEMENT and PERMISSION_OVERRIDE_ANIMATIONS. Reviewed by Simon. 2013-03-19 19:25:24 +00:00
Dave Parks 7a71c094b9 MAINT-2410 Extra Particle Parameters -- port of Kelly's simulator changeset 2013-03-08 18:12:19 -06:00
Maestro Linden b8bd81f7f3 MAINT-2109 Added ATTACH_NECK and ATTACH_AVATAR_CENTER definitions for LSL scripts and script information floater. Reviewed by Andrew. 2012-12-13 19:59:47 +00: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
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
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 ff3289e2f3 ER-898: Modify llGetParcelDetails() on viewer to support parcel privacy. Reviewed by Kelly. 2011-05-13 13:56:49 -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
Oz Linden 06b0d72efa Change license from GPL to LGPL (version 2.1) 2010-08-13 07:24:57 -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
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) 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 bc4444cd78 Merge into viewer/viewer-20 yesterday's lindenlab/svn-imports-viewer-20 2009-09-26 18:08:24 -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
Bryan O'Sullivan 30ff6cabd6 Merge with trunk 2009-08-31 13:47:47 -07:00
Steven Bennetts a1ed9ccf73 Partial merge of: viewer-2.0.0-3@131138 texture-pipeline-3@131862 -> 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-29 06:23:41 +00:00
Christian Goetze d025b721e0 svn merge -r126867:127217 svn+ssh://svn.lindenlab.com/svn/user/cg/qar-1691
Effective merge: svn merge -r125827:127126 svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.27
QAR-1691
2009-07-15 17:55:58 +00:00
Christian Goetze e588d1f284 svn merge -r125825:125901 svn+ssh://svn.lindenlab.com/svn/user/cg/qar-1654
QAR-1654 merge completed.
2009-07-01 00:22:05 +00:00
Adam Moss b01c75cb42 svn merge -r117314:117337
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/mv13a-merge-1

QAR-1343 maint-viewer-13a+libcurlexploitfix-3-3 combo merge
2009-04-16 23:45:35 +00:00
Kelly Washington aa2b978bf5 merge -r 112783:112799 linden/branches/kelly/lsl-http-in-merge to linden/trunk 2009-02-24 19:29:36 +00:00
Aaron Brashears e3cf284388 Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 2009-01-08 00:05:06 +00:00
Robert Knop 189599b6ff Merging from server/server-1.25 back to trunk.
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-12-04 22:36:34 +00:00
Bryan O'Sullivan b3f8a04823 Fix more silly printf crasher holes 2008-10-31 18:51:42 +00:00
Christian Goetze b069bb9e71 svn merge -r96886:98039 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-24-Server --> release 2008-10-01 00:42:47 +00:00
Steven Bennetts da94c0eaa2 QAR-855 Viewer 1.21 RC 2
merge viewer_1-21 94770-96059 -> release
2008-09-12 06:27:13 +00:00
Steven Bennetts b9b4a4d934 QAR-782 Merge featurettes batch #2
merge featurettes-6-merge-2 -> release
dataserver-is-deprecated
2008-08-13 19:37:05 +00:00