livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
25,698 Commits
2 Branches
0 Tags
297 MiB
Commit Graph

110 Commits (08ae21f52dbbe6245ac8deee0fdfd5df4d3dba53)

Author SHA1 Message Date
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
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 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
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
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
brad kittenbrink d020dae7b9 Merged latest login-api with latest viewer-2.0.0-3 up through plugin-api-05 merge (r131929). 
Some minor post-merge cleanups still required.
 2009-08-27 16:25:02 -04:00
Richard Nelson 138bf11322 merge -r 130399-131510 skinning-21 -> viewer-2.0.0-3 
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-08-24 20:04:52 +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
Steven Bennetts 9ec432034d merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3 
ignore-dead-branch
 2009-06-21 08:04:56 +00:00
Brad Kittenbrink 01d390825a DEV-27646 dll linkage for login module. 
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-22 23:27:16 +00:00
Steven Bennetts a4000c3744 merge trunk@116587 skinning-7@119389 -> viewer-2.0.0-skinning-7 2009-05-08 07:43:08 +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 289697fc5e Fix exporting files list and legal headers on files that will be exported. 2009-02-24 22:53:38 +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
Robert Knop ea8e83274a svn merge -r 108748:109731 svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.25 
Merge server 1.25 back to trunk

Conflicts:

C    indra/llcommon/llversionserver.h  : svn reverted

C    indra/tools/bill/MoneyMachine.pm : one conflict, only difference
                                        was a blank line.

C    indra/newsim/lllslmanager.cpp : kept merge-right, in consultation
C    indra/newsim/lllslmanager.h   :   with babbage
C    indra/newsim/llagentinfo.cpp  : (runNested, not runSpecial)

C    indra/test/test_entity_query.py        : Kept merge-right
C    indra/test/test_agent_linden_dollar.py : Kept merge-right
                  --> Kartic fixed these testes in server-1.25

C    indra/test/template/httpd.tmpl : Kept merge-right
                                      (the IfModule version)
 2009-02-06 19:14:32 +00:00
Andrew Meadows 15a6d273cc svn merge -r108142:108148 svn+ssh://svn.lindenlab.com/svn/linden/qa/maint-server/maint-server-5-r108113 2009-01-17 01:29:45 +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
Christian Goetze a8d88418ce QAR-1075 svn merge -r106114:106224 svn+ssh://svn.lindenlab.com/svn/linden/branches/parcel-stats-merge 2008-12-18 00:39:23 +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
Kent Quirk 9d7c56bf16 QAR-829: svn merge -r98245:HEAD svn+ssh://svn.lindenlab.com/svn/linden/branches/dev_10747_5 -> release 2008-10-07 21:53:42 +00:00