Age | Commit message (Collapse) | Author |
|
|
|
requests in LLHTTPClient. Fixed munging of "Pragma" headers in LLHTTPClientAdapter
|
|
|
|
|
|
crashes.
|
|
curl handles.
Added call to that function everywhere curl handles are created in the viewer.
|
|
back-out the back-out for this branch. yay.
|
|
Backing out this merge that I pushed (prematurely) to the wrong place.
|
|
|
|
|
|
Reviewed by Tofu.
|
|
We now free the fileBuffer when we're done in VFileInjector::process_impl()
|
|
|
|
|
|
|
|
|
|
svn merge -c120157 svn+ssh://svn.lindenlab.com/svn/linden/branches/giab-viewer/giab-viewer-2
|
|
svn+ssh://svn/svn/linden/branches/server/server-1.30 into trunk
QAR-1863: Merge 525 changes from 1.27 -> 1.30 -> trunk
1.27 Changes:
* QAR-1721: Vivox Recurring Billing (ViRB)
* QAR-1743: 525 AO Classifieds
* DEV-37701: Fix cleanup_indra nightly script so that it doesn't fail, and so that we know if it does
* DEV-37926 - Fairmarket key roll 8/12/2009
* QAR-1744: 525 Landstore
* QAR-1797: disable web services for find_people
* QAR-1758: OpenID and Backup/recovery.
* QAR-1794: ViRB proc fix - proc/recurring_billing/GetLocaleCountryByPackageId.php
* Changing parameter name so the module signal could be used properly in the function below
* QAR-1808 : Self-Reported First Name and Self-Reported Last Name have duplicate entries in the registration table
* DEV-30204 : Moved the registration table from sequence to indra_aux.
* removed dungeon from banned keyword list
* DEV-30204 : Moved the registration table from sequence to indra_aux. Reviewed by kelly, cg, jarv
* Merging new streambase dwell nightly to server-1.27
* Add update_parcel_dwell.py to serial_maintenance rule in the nightly.make Makefile, removing the dwell rule, since we don't want it running in parallel with other expensive nightly scripts.
1.30 Changes:
* DEV-27476: version-manager only works in Firefox
* DEV-27472: version-manager appears to load javascript from third party site.
* mulib r92 that supports If-Modified-Since header and prevents arbitrary
filesystem access through host:12107/manager/mochi/..
* Trivial conductor change that prevents a traceback when no regions are
available to start.
* Fixing "Out of Connections" error when running tests via SCUT
* DEV-37554 - farm_deploy should get its ssh timeout from farm.ini
* undo two lines of debugging changes that accidentally were checked in to farm
* Adding MochiKit to MANIFEST for version-manager.
* revised files for new parcel dwell process
* Changing vault from an 'http' svn extern to a 'svn+ssh' svn extern.
* DEV-38504 RPS map item queries are too verbose
* added --skip-grid-mode-prompt to main in farm
* DEV-38607: Region Presence Service includes disabled regions in estate responses, resulting in high slave query rate.
* DEV-34781 - enable use_space_server_for_map_items and set map_item_request throttle settings in simulator.xml
* DEV-38351 changes to ip_blacklist.xml file never get automatically picked up by the simulator
* DEV-35443 Region border crossing issues.
* DEV-35443 revert overzealous validity checking on neighbor messages.
* DEV-15998 changing settings to re-enable teleport throttle, following DEV-37200 fix
* QAR-1822 CPU Overrides update to indra.xml
* DEV-15998 changing settings to re-enable teleport throttle, following DEV-37200 fix
* DEV-34026 Update LLAgentInfo::forwardViewerStats() to make all viewer statistics
* DEV-38906 Teleport throttle blocks prematurely when agent teleports back and forth between 2 regions
* DEV-38861 Intra-region TP is blocked by inter-region TP throttl
* DEV-38504 RPS map item queries are too verbose
* initial import of deploy_to_dev_grid.sh
|
|
svn+ssh://svn/svn/linden/branches/http_database/merge-03 into trunk. QAR-1462
|
|
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/mv13a-merge-1
QAR-1343 maint-viewer-13a+libcurlexploitfix-3-3 combo merge
|
|
svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.26
Merge latest 1.26 into trunk
|
|
svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165
|
|
svn+ssh://svn.lindenlab.com/svn/linden/branches/rad-chilies/rc05-release-merge
|
|
be replaced later with final code, but we need to unblock release
|
|
svn+ssh://svn/svn/linden/branches/apache-caps/merge-to-release into release. QAR-824
|
|
QAR-825 DEV-18489 Event poll is brittle and doesn't parse status correctly
|
|
svn+ssh://svn.lindenlab.com/svn/linden/branches/mono-r93014-qar633 dataserver-is-deprecated
|
|
dataserver-is-deprecated
|
|
svn+ssh://svn.lindenlab.com/svn/linden/branches/qar-699_combo-merge --> release
QAR-699 - Combo merge for QAR-687, QAR-637, QAR-586
* QAR-687 - Test build with libs on S3
* QAR-637 Test dynamic sound throttle
* QAR-586 Test new http features branch
|
|
svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-21-Server --> release
Land store (already deployed to agni as 1.21 patches)
* Increased the available purchase area in the land store.
* Modified select pool query to take a simulator status. Now generating a new uuid for each insert into the fulfill lock table.
* Checking to make sure put-simstate returns a uuid region_id.
Other stuff (going out soon or already out)
* svn merge -r87339 svn/linden/branches/havok4/havok4-6 (Block creation of mega prims.)
* Fix for the mega prim fix to also block 0 scale prims.
* svn merge -r 84565:86084 svn+ssh://svn.lindenlab.com/svn/linden/branches/single-ref-attach-again --> Branch_1-21-Server (Slipstream QAR-518 single ref attachments)
* Switched off indra.known_address in favor of indra_aux.known_address
* DEV-15151 check_group_land.py kills the database
* DEV-14662 - Change the current model of PREPARE/EXECUTE to directly execute the SQL (QAR-580)
* DEV-15167 Random failure with set-classified-stats
The secret word is: dataserver-is-deprecated
|
|
svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-19-1-Server --> release
Merge patches from 1.19.1 Server branch:
* QAR-293 Fix for hardcoded TTLs in web dataservices
* DEV-10826 fix for busted binary and notation parse if handed an unlimited parse size
* Bounce apache2 processes before starting backbone/dataserver/simulator
* Changing web-ds TTL in a way that any query that has 0 < ttl <=60 will have ttl = 61.
* Partial reversion of multiagent-chat to 1.19.0 to address fast memory leak
* Fixed minor, non user facing bug in multiagentchat
* set-classified-stats: Rewrote to use new MDB2 query reformatting syntax
* Fixed possible bad conversion of vivox data
* DEV-550, caching changes to DirClassifieds Query
* QAR-240 (DEV-8488) Prevent residents from purging stuff that isn't trash on the backend
* More mem leak fixes for multiagent-chat
* QAR-274 Fetch inventory descendents over TCP (via HTTP cap) instead of UDP
* DEV-10151: Sometimes group IMs appear to be person to person IMs
* QAR-321 Changes to crash_reporter
* DEV-11004 Speed up people search query using FORCE INDEX (PRIMARY) on the username table if the first-name query fragment is >= 3 chars
* DEV-11004 Speed up people search query using FORCE INDEX (PRIMARY). Web service version of this, must use two named queries because we need to change the query based on input string length.
|
|
svn+ssh://svn.lindenlab.com/svn/linden/branches/parcel_media/sl-parcelmedia-6 --> release
QAR-275 Parcel Media
Sam made me do it.
|
|
svn+ssh://svn.lindenlab.com/svn/linden/qa/maintenance-5-merge-79386
QAR-242 merge of maintenance-5 (QAR-203)
* DEV-6548 Copy To Inventory fail to execute without any output feedback when Notecard has changes but not saved
* DEV-7600 Deleting someone else's object in god mode crashes sim
* DEV-5329 LLSD parsers should determine and set maximum parse sizes
* DEV-7473 Resolve instant message crash report
* DEV-2904 Presence Issues not (apparently) caused by scripted attachments
* DEV-7083 Investigate Null Folder IDs Bug that caused 470K inventory items with Null Folder IDS on the Grid
* DEV-2865 Textures/Snapshots in a notecard are opened again when you click copy to inventory.
* DEV-6612 VWR-3290: Linux scons build script doesn't work with distcc
* DEV-8002 c++ llsd notation parser accepts malformed data
* DEV-8001 c++ xml parse returns wrong number of elements parsed
* DEV-8089 Double delete in statc structured data parse functions
* DEV-5326 Any viewer can request presence information for any agent
* DEV-2378 python service builder does not sort query string
* DEV-7872 Block teleport off teen grid sub-estates like Schome Park / Open University
* DEV-4465 Add a "logfile" command line option to the sim to create log files
|
|
svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-6-Viewer --> release
Wheee, this was fun. Um, let's back-port fixes a little more rapidly next time. Reviewed by CG until alexandria died, did the rest by my lonesome.
|
|
svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code.
|
|
svn+ssh://svn/svn/linden/branches/named-queries-py3 into release.
|
|
|
|
NOTE: r63705 is *not* the earliest rev# for dpo-3-bug-fix.
|
|
svn+ssh://svn/svn/linden/branches/release-candidate@65078 -> release Paired by Tess and rdw.
|
|
svn+ssh://svn/svn/linden/release@63615 svn+ssh://svn/svn/linden/branches/release-candidate@63637 | patch -p0 in release
|
|
into release
|
|
into release
|
|
svn+ssh://svn/svn/linden/branches/rez-content-loss-1 into release
|
|
|
|
svn+ssh://svn.lindenlab.com/svn/linden/branches/release-candidate@59163 --> release
|
|
|
|
|
|
|