summaryrefslogtreecommitdiff
path: root/indra/lscript
AgeCommit message (Collapse)Author
2008-06-19svn merge -r 89027:90119 ↵Josh Bell
svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-22-2-Server --> release Backport server patches from 1.22 Server production branch to the trunk. * DEV-16189 Search: Private Estate on Teen Grid Visibility issue. ** svn merge -r88933:89027 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-22-Server * QAR-651 / DEV-14894: Convert relevant webservices to use the on/in syntax to prevent them from needlessly hitting mysql.agni ** svn merge -r89027:89030 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-22-Server * Adding back the type_mask checking which was causing extra terms to be blacklisted. ** svn merge -r89030:89032 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-22-Server * Under GCC, argument names must match between declaration and definition * Incorrect rename * Cherry pick fix for DEV-16131, already pushed live to agni ** svn merge -c 89174 svn+ssh://svn.lindenlab.com/svn/linden/release * QAR-664 Resolve start-location Errors on Login ** svn merge -r 88842:89176 svn+ssh://svn.lindenlab.com/svn/linden/branches/user_start_location_missing_fix * QAR-668 / SEC-53: Script that crashes regions (Round 2) ** svn merge -r 89206:89210 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-22-2-Server_DEV-12357 * QAR-579 / SEC-77 - prevent sim crash caused by libsl proxy packet injection ** svn merge -r 87143:87226 svn+ssh://svn.lindenlab.com/svn/linden/branches/sec-77-crash * DEV-16297 Error Message Can't rez object because you are not allowed on the parcel on some group owned parcels ; Group permissions & rezzing on group land changed in 1.22.2 * DEV-16189 - New query to get a region's parent estate, so we can hide main grid regions from teen users (and vice versa) in All search. * svn merge -r 89494:89593 svn+ssh://svn.lindenlab.com/svn/linden/branches/safe-locations/kill-table-scan --> Branch_1-22-2-Server * simulator.xml file that has improved-im and send-mail enabled. * DEV-16477 and DEV-16380 - fixes to prevent ever expanding db table and writing LLMETRICS to syslog for streambase. * Fixed a teeny bug that caused sorting to be messed and broke DEV-16745. * Adding geolocation IsPass proc to Branch-1-22-2. It is needed to login.cgi work that can only be done against agni at the moment * QAR-693 svn merge -r89984:89986 svn+ssh://svn/svn/linden/branches/security/rez-attach_sec-95 into Branch_1-22-Server. * QAR-619 svn merge -r87886:87945 svn+ssh://svn.lindenlab.com/svn/linden/branches/security/sim-crash-sec-83 into Branch_1-22-Server * Permanently enabling procs as part of DEV-14770 - Enable script-data-requests * Changed TTL to 300 seconds (5 mins) to match lldatabaseconnector's time out value * Permanently enabled parcel-info. Deployed to grid: June 18, 2008. Tracking Jira DEV-14135 * Updated named query TTL to 3600. Used to be 0
2008-06-02svn 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-19EFFECTIVE MERGES:Don Kjer
svn merge -r 79616:82632 svn+ssh://svn/svn/linden/branches/maintenance/maintenance-7 into release svn merge -r 83211:87215 svn+ssh://svn/svn/linden/branches/php-framework-3 into release ACTUAL MERGE: svn merge -r 87631:87698 svn+ssh://svn/svn/linden/qa/combo-merge-maintenance-7-php-framework-3 into release dataserver-is-deprecated
2008-05-11QAR-566 maint-viewer-5-merge-2Steven 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-08QAR-570 maint-render-4 mergeSteven Bennetts
merge -r 87067:87077 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-render/maint-render-4-merge -> release. dataserver-is-deprecated.
2008-05-07Back out QAR-520 maintenance-7 merge -- svn merge -r 86947:86946 ↵Brian McGroarty
svn+ssh://svn.lindenlab.com/svn/linden/release dataserver-is-deprecated
2008-05-07QAR-520 maintenance-7 merge -- svn merge -r 84923:86093 ↵Brian McGroarty
svn+ssh://svn.lindenlab.com/svn/linden/qa/maintenance-7-sandbox-84884 -- dataserver-is-deprecated
2008-04-30Workaround for cygwin flex 2.5.35 bug.Steven Bennetts
Reviewed by Phoenix
2008-04-28svn merge -r 84911:86069 ↵Josh Bell
svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-21-Server --> release Backport fixes made in the production branch to the trunk now that it is live on the grid: * DEV-14443 Launcher not producing colo prefix when looking up sim class * DEV-10840 "/etc/init.d/backbone stop" returns before all child backbones exited; "backbone restart" results in defunct children * DEV-12558: Able to make anyone's object shout error messages * QAR-483 user start location migration prelude * QAR-490 havok4-6 * Revert havok4-5/4-6 code changes causing parcel access check issues * Revert QAR-277 sqlite-backbone * DEV-12357 SEC-53: Script that crashes regions * QAR-486 New proc and query for Web Classifieds Fix
2008-04-09svn merge -r83893:84415 ↵Dave Kaprielian
svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-20-0-Server
2008-03-10QAR-345 merge windlight scriptglow3 into releaseBrad Kittenbrink
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-07svn merge -r 80990:81720 ↵Josh Bell
svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-19-1-Server --> release Reg-api merge is the bulk of the diff, it's actually not so bad. Change summary: * Fixed a bogus HTTP/curl warning and cleaned up one line of code for clarity * extra '.' in FQDN names/extra . in the non-FQDN case, which is a syntax error * DEV-11542 Joining two parcels destroys search relevance of a store. * Fixed bug preventing users who turn off email notification from getting offline messages at login * Updated version numbers * New reg-api (w00t!) * DEV-11427 / DEV-11399 - LSL slowdown from strncpy buffer-clearing overhead * DEV-11359 Hide music URL should be on by default * Update to r89 of eventlet * QAR-347 "SEC-28 - It is possible to rez any object, whether you own it or not." * QAR-336 Additional logging to track teleport failures * DEV-11397 - use the slave db for read queries for crons * Fix to turn off PEAR debug logging * Copied code from eventlet.coros to make an Updater that won't die so easily. (multiagent-chat) * Various chicanery with dir-find query * Emergency fix for bad FORCE INDEX on user table when actually searching on the user_last_name table * DEV-11124 : Modify backbone service proxy so that we know which web-ds host a dataservice is actually called * Fixes for DEV-5883 : Test improved-instant-message
2008-02-16svn merge -r 80024:80160 ↵Josh Bell
svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-19-1-Server Port fixes for: * DEV-10609 Checkboxes in About Land untick when selected * Extend the sim node regex to support sim1-telstra.durga.lindenlab.com for colo testing. * Provide "version_valid" for each version when querying a channel * Update to latest eventlet r87, to handle multi-character terminators split across read buffers * DEV-10487 Log viewer stats sim and php fix * QAR-288: Pull in crash fixes from LSL bytecode parsing
2008-02-14svn merge -r 79730:79944 ↵Josh Bell
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-13svn merge -r 79455:79892 ↵Josh Bell
svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-19-0-Server --> release * DEV-10498 The agentN-ds host name was constructed incorrectly and caused services_base_url to be incorrect * Fixed a potential crash bug caused by LSL library functions returning null pointers instead of empty strings.
2007-11-20Reverting accidental changes from age-verification merge (only affects vc8 ↵Steven Bennetts
build)
2007-11-15merge of age verification changes from QAR-76 to release; changes were ↵Kent Quirk
originally made on the age_verification_2007xxxx branches; final changes were QA'd on age_verification_20071112.
2007-11-08Reverting unintentional commit of indra.lSteven Bennetts
2007-11-07Removied viewer.h from macview_prefix.hSteven Bennetts
2007-11-05merge -r71488:71881 ↵Karl Steifvater
svn+ssh://svn.lindenlab.com/svn/linden/branches/flex-bison --> release
2007-10-04Result of svn merge -r71162:71205 ↵Aaron Brashears
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-04Result of svn merge -r70873:71086 ↵Aaron Brashears
svn+ssh://svn/svn/linden/branches/enable-exceptions into release.
2007-09-28EFFECTIVE MERGE: svn merge -r 68999:69916 ↵Don Kjer
svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance into release ** This should be the last merge from branches/maintenance. All future merges will be from new maintenance-# branches off release ** ACTUAL MERGE: svn merge -r70609:70621 svn+ssh://svn/svn/linden/branches/maintenance-0-qa-r70556 RELATED MERGE: svn merge -r69921:70316 svn+ssh://svn/svn/linden/branches/maintenance-0-qa
2007-09-13svn merge -r 68690:69597 ↵Josh Bell
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-08-21EFFECTIVE MERGE: svn merge -r 66133:68118 ↵Christian Goetze
svn+ssh://svn/svn/linden/branches/maintenance into release Actual action: branched maintenance-r68118, merged in release, then copied result into release
2007-07-26merge -r66262:66263 linden/branches/kelly/llgetobjectdetails-2Kelly Washington
2007-07-26EFFECTIVE MERGE: svn merge -r 65485:66133 ↵Don Kjer
svn+ssh://svn/svn/linden/branches/maintenance into release This includes fixes to the maintenance-r66133 branch, and sync'ing up with release@r66392 ACTUAL MERGE: svn merge -r 66394:66435 svn+ssh://svn/svn/linden/branches/release-r66392 into release EQUIVALENT TO: svn merge -r 65485:66434 svn+ssh://svn/svn/linden/branches/maintenance-r66133 into release (plus branch sync'ing)
2007-07-20svn merge -r 64548:64837 svn+ssh://svn/svn/linden/branches/maintenance into ↵Don Kjer
release * WARNING *: maintenance r64837 is not the last rev to use in the next merge. use r65269
2007-07-18svn merge -r64837:65485 ↵Bryan O'Sullivan
svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release (only inside indra) (josh) Original log message was: svn merge -r64837:65485 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance bos updated it to be: svn merge -r64837:65269 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance However, it appears it actually was: svn merge -r64837:65485 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance ... missing some file additions.
2007-07-12svn merge -r65092:65220 ↵Bryan O'Sullivan
svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance-r64837
2007-07-02svn merge -r 64079:64548 svn+ssh://svn/svn/linden/branches/maintenance into ↵Don Kjer
release
2007-06-21merge -r62831:64079 branches/maintenance to releaseKelly Washington
2007-06-04svn merge -r 62602:62831 ↵Josh Bell
svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
2007-05-23svn merge svn+ssh://svn.lindenlab.com/svn/linden/release@62339 ↵Brad Kittenbrink
svn+ssh://svn.lindenlab.com/svn/linden/branches/release-candidate62341 -> release
2007-05-02svn merge -r 60342:61148 svn+ssh://svn/svn/linden/branches/maintenance into ↵Don Kjer
release
2007-04-11svn merge -r 59968:60342 ↵Josh Bell
svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
2007-03-26Effectively: merge 59238:59702 Branch_1-13-4 --> release EXCEPT for the back ↵Josh Bell
out (r59497) and re-patch (r59531) of upload-queue, and fixes merged directly from Maintenance. merge -r 59328:59428 Branch_1-13-4 --> release * address regex needs "s" option to support multiline addresses. Patched previously, not sure how it got dropped. * added new promo code to accommodate printer error * Fix for SL-37108 "SVC-55: look at may be broken" * Paired/reviewed with Qarl * Release notes for Release Notes for 1.13.4(59329) * merge release-candidate@58928 long-live-legacy-particles@59317 -> Branch_1-13-14 SKIP -r 59428:59437 (temporary), 59437:59465 (from release), 59465:59497 (back out of upload-queue) merge -r 59497:59510 Branch_1-13-4 --> release * SL-37932 legacy particle clean up * SL-33228 llParticleSystem( [] ) may not shut down reliably * SL-37909 llParticleSystem([ ]) bug now affects unlinked and root prims SKIP -r 59510:59531 (re-patch of upload-queue) merge -r 59531:59585 Branch_1-13-4 --> release * blacklist and release notes updates SKIP -r 59585:59656 (patches from maintenance) merge -r 59656:59691 Branch_1-13-4 --> release * blacklist and release notes updates SKIP -r 59691:59702 (already ported to release)
2007-03-20svn merge -r59459:59476 ↵Karen Clark
svn+ssh://svn.lindenlab.com/svn/linden/branches/adroit.r69-75_2 into svn+ssh://svn.lindenlab.com/svn/linden/release.
2007-03-16merge -r 59028:59178 maintenance -> release.Steven Bennetts
2007-02-20svn merge -r 57620:58007 ↵Josh Bell
svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
2007-02-09Result of svn merge -r57350:57790 ↵Aaron Brashears
svn+ssh://svn/svn/linden/branches/os-patches.001 into release.
2007-02-02Result of svn merge -r57264:57370 ↵Aaron Brashears
svn+ssh://svn/svn/linden/branches/adroit.r40-68 into release.
2007-01-18Result of svn merge -r56700:56797 ↵Aaron Brashears
svn+ssh://svn/svn/linden/branches/more-random into release.
2007-01-18merge -r 56738:56842 maintenance.Steven Bennetts
2007-01-15svn merge -r 56599:56738 ↵Josh Bell
svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
2007-01-02Print done when done.James Cook