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

64 Commits (0249a0d1e7564d06eadb8a23b0f058008dfd6068)

Author SHA1 Message Date
callum a6fc0f63bf MAINT-922 FIX Client side code to catch the SCRIPT_PERMISSION_TELEPORT request from similator and display a notification 
Reviewed by Simon
 2012-04-10 15:31:05 -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
Dave Hiller 9a7d68cfce svn merge -r93014:93396 svn+ssh://svn.lindenlab.com/svn/linden/branches/mono-r93014-qar633 dataserver-is-deprecated 2008-07-31 12:15:15 +00:00
Kyle McKay b4ed6bb95c Explicitly mark the generated files with the GENERATED property to make sure CMake handles them correctly 2008-07-27 00:29:30 +00:00
Steven Bennetts 926ea0b39a QAR-669 1.20 Viewer RC11 
QAR-648   1.20 Viewer RC10
merge Branch_1-20-Viewer-2 -r 88724:90511 -> release
 2008-06-27 21:02:01 +00:00
Steven Bennetts 25c10ed028 QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 
dataserver-is-deprecated
 2008-06-26 00:39:00 +00:00
Bryan O'Sullivan 9db949eec3 svn merge -r88066:88786 svn+ssh://svn.lindenlab.com/svn/linden/branches/cmake-9-merge 
dataserver-is-deprecated
for-fucks-sake-whats-with-these-commit-markers
 2008-06-02 21:14:31 +00:00
Steven Bennetts 875606a04d QAR-566 maint-viewer-5-merge-2 
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-11 20:56:42 +00:00
Steven Bennetts 63e7894148 QAR-570 maint-render-4 merge 
merge -r 87067:87077 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-render/maint-render-4-merge -> release. dataserver-is-deprecated.
 2008-05-08 18:41:20 +00:00
Steven Bennetts cf2a96375f Workaround for cygwin flex 2.5.35 bug. 
Reviewed by Phoenix
 2008-04-30 22:45:41 +00:00
Dave Kaprielian 16f6d79f76 svn merge -r83893:84415 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-20-0-Server 2008-04-09 06:12:20 +00:00
Brad Kittenbrink ba607fe406 QAR-345 merge windlight scriptglow3 into release 
Qarl's viewer and simulator patch to add glow functionality to
llGetPrimitiveParams/llSetPrimitiveCommands

svn merge -r 81743:81787 svn+ssh://svn.lindenlab.com/svn/linden/branches/merge_scriptglow3_r81714
 2008-03-10 16:32:21 +00:00
Josh Bell 98fd90ddd6 svn merge -r 79730:79944 svn+ssh://svn.lindenlab.com/svn/linden/branches/parcel_media/sl-parcelmedia-6 --> release 
QAR-275 Parcel Media

Sam made me do it.
 2008-02-14 01:45:59 +00:00
Steven Bennetts 9a85f0d0bd Reverting accidental changes from age-verification merge (only affects vc8 build) 2007-11-20 03:42:06 +00:00
Kent Quirk 138bf17c3c merge of age verification changes from QAR-76 to release; changes were originally made on the age_verification_2007xxxx branches; final changes were QA'd on age_verification_20071112. 2007-11-15 19:10:29 +00:00
Steven Bennetts 0771e39d20 Reverting unintentional commit of indra.l 2007-11-08 00:16:19 +00:00
Steven Bennetts 424af0690a Removied viewer.h from macview_prefix.h 2007-11-07 23:15:09 +00:00
Karl Steifvater 6fd04521d7 merge -r71488:71881 svn+ssh://svn.lindenlab.com/svn/linden/branches/flex-bison --> release 2007-11-05 19:51:45 +00:00
Aaron Brashears 5595a99623 Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code. 2007-10-04 23:19:43 +00:00
Aaron Brashears 4942a7b779 Result of svn merge -r70873:71086 svn+ssh://svn/svn/linden/branches/enable-exceptions into release. 2007-10-04 16:31:48 +00:00
Josh Bell b3d807d5ff svn merge -r 68690:69597 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-3-Viewer --> release 
Merge patches made in the 1-18-3 RC iterations into the trunk.
NOTE: Includes the reversion of SL-51274 (originally maintenance r67559, changed lltracker.cpp)
 2007-09-13 18:17:52 +00:00
Christian Goetze ce0a5fe145 EFFECTIVE MERGE: svn merge -r 66133:68118 svn+ssh://svn/svn/linden/branches/maintenance into release 
Actual action: branched maintenance-r68118, merged in release, then copied result into release
 2007-08-21 22:17:53 +00:00