Commit Graph

71 Commits (458f4ebb034b67af315972738e35074afa355f87)

Author SHA1 Message Date
Tank_Master dc58f56a88 LLProxy bugfixes and cleanup. Work done by Log Linden 2011-09-12 21:39:18 -07:00
Tank_Master 205747903f Reintroduce Socks5 support with latest LL code from v-dev (Work done by Log Linden) 2011-09-03 00:49:31 -07:00
Tank_Master 537cf438c4 Backed out changeset: e232799510ef (Old socks5 proxy code)
Prepairing for merging in LL's new version.
2011-09-01 09:23:57 -07:00
Arrehn 9fd0edb326 Initial 2.8.3+ merge, Tozh & Arrehn
Issues: Graphics preferences tab, lighting, depth of field
Issues: Color preferences tab, new direct chat
Issues: Build floater Mesh build tab
Issues: German translations of build, viewer menus
Issues: pipeline issues with mac, possibly other things
Issues: uploading content / temp content
Issues: Windlight quickprefs, parcel windlight, RLVa windlight
2011-08-26 11:18:49 -04:00
Arrehn e277b8a4ac Merge with LL 2.6.9, initial work. Needs tests, extra XUI merging with particular skins. 2011-08-04 11:53:40 -04:00
Dave Parks 9883c33993 SH-2183 Thread local storage initialization is unreliable. 2011-08-02 12:47:35 -05:00
Dave Parks aa0e35142a SH-2183 Only apply multi-threaded curl on the main thread. 2011-08-02 12:23:50 -05:00
Dave Parks fbd5bd7adc SH-2183 Add a debug setting to control whether or not to use multiple threads in LLCurl 2011-08-01 17:50:43 -05:00
Dave Parks cd923af21f SH-2183 Fix for multi-threaded curl not playing nice with mesh upload. 2011-07-28 00:26:30 -05:00
Nyx (Neal Orman) c07f55e605 merging latest viewer-development to mesh merge candidate. 2011-07-25 18:26:14 -04:00
Dave Parks 26a9a6929c SH-2031 Fix for sometimes deadlocking a curl thread. 2011-07-22 16:22:51 -05:00
Dave Parks e4a8ef4ce2 SH-2031 Cleanup from threaded curl implementation (remove errors/loops on shutdown). 2011-07-22 02:33:55 -05:00
Dave Parks 7b6afd1eba SH-2031 Followup to curl threading work -- don't start and stop the thread on every request, use a signal (cuts time spent in Pump IO down from 1-2 ms to 0.1ms) 2011-07-21 23:33:23 -05:00
Dave Parks 764a13a196 SH-2031 Don't do network I/O from the main thread in llcurl.
Reviewed by Kelly
2011-07-21 17:35:04 -05:00
Tank_Master 5771402086 HTTP and socks 5 proxy support (Not tested). Work done by Log Linden 2011-07-10 01:47:26 -07:00
Xiaohong Bao aba4f7ddc8 fix for SH-1870: can not upload book_collection_1.dae when include textures 2011-06-20 14:01:32 -06:00
Dave Parks 93696ac019 merge 2011-05-12 17:39:08 -05:00
Leslie Linden 3063c1be41 EXP-772 -- Log in failure, keeps saying DNS cannot resolve hostname.
No real progress on this Jira yet but Mac build was not properly reporting the CURL error string.
This check-in fixes that.

So far, I have backed out URL related changes between 2.6.2 and 2.6.3 without any change in behavior.
Unsure how to proceed next although comparing libcares and libcurl builds between 2.6.2 and 2.6.3 seems
like it could be the next logical step.

Users experiencing the problem can go back to vewere 2.6.2 or adjust DNS settings to use the google free
DNS servers 8.8.8.8 and 8.8.4.4 which should allow them to work around the problem.

Reviewed by Richard.
2011-05-04 16:27:59 -07:00
Dave Parks a761351396 SH-813 Switch llerrs in llcurl.cpp to an assert. 2011-02-11 19:07:11 -06:00
Loren Shih aa9d9901e8 SH-580 FIXED Crash in curl on exit
New defensive programming added this llerrs trigger.  This is worth investigating but not at the top of our priority at the moment.  Reverting to llinfos for now as has been done for non-Windows builds already.
2011-02-03 17:49:19 -05:00
Nyx (Neal Orman) 1f9ae081ec BUILDFIX making curl asserts llinfos for non-windows platforms
linux curl appears to throw an initialization error once per session
after login. Can't hunt it down right now, so making curl asserts
llinfos for non-windows platforms. Also added a new assert on curl
initialization.
2010-11-05 14:26:25 -04:00
Nyx (Neal Orman) a2b25828aa BUILDFIX curl error causes linux build to crash on login.
Switching curl errors from llerrs to llinfos allows the client to continue
on its merry way. Will file a jira to follow up later on why the error
happens in the first place.
2010-11-04 17:50:10 -04:00
Dave Parks b197f90036 Aggressive error checking in curl. 2010-10-19 23:18:30 -05:00
Oz Linden a5619d16f7 correct licenses (fix problem with license change merge) 2010-10-13 07:24:37 -04:00
Oz Linden 06b0d72efa Change license from GPL to LGPL (version 2.1) 2010-08-13 07:24:57 -04:00
Dave Parks 2f012dd34f merge 2010-08-25 14:48:18 -05:00
Palmer aac8bf0988 EOL added. 2010-07-22 15:26:55 -07:00
Palmer 7d73afe895 EXT-7145 - Handle http redirects in viewer properly. Didn't work before.
Reviewed by Bao and Babbage
2010-07-22 15:20:45 -07:00
Dave Parks f461ae214c Merge with render-pipeline 2010-06-07 23:05:22 -05:00
Tofu Linden 3057651b1a EXT-7145: FIXED: make viewer to handle "URL redirect " for http texture.
Backed out changeset e6feef9704cf to re-introduce Bao's fix
2010-06-07 17:31:22 +01:00
Tofu Linden 87d0c6d583 Backed out changeset 57e00f7d4d4f
(was: EXT-7145: FIXED: make viewer to handle "URL redirect " for http texture.)

This was causing osx/linux build failure.
2010-05-24 07:49:26 +01:00
Xiaohong Bao 9dada6bcc4 EXT-7145: FIXED: make viewer to handle "URL redirect " for http texture. 2010-05-18 14:14:50 -06:00
Roxie Linden 658ccc3e85 Re-insert backed out SLE checkin so we can fix it 2010-04-07 11:08:04 -07:00
Tofu Linden 58d1999d47 merge from viewer-trunk 2010-04-07 13:08:54 +01:00
Tofu Linden 0bb3f144c0 Backed out changeset 63b699f90efd 2010-04-07 10:37:07 +01:00
Tofu Linden 8f16be49dc some fixing from the viewer-trunk merge. 2010-04-06 15:09:18 +01:00
Tofu Linden 3c47d1faf1 another hairy merge from viewer-trunk :( 2010-04-06 14:47:43 +01:00
Dave Parks e38adc5baf cleanup from review 2010-03-02 12:35:19 -06:00
Dave Parks e9d926385f Curl tweaks to get rid of various types of timeouts.
- Scrub host names from capability ips (requires disabling SSL host name verification)
- Reset connections that have received a timeout (avoids cascading timeouts from reusing a cached bad connection)
2010-03-02 12:03:00 -06:00
Dave Parks 4de1893702 Added lower level pool to curl easy handles to speed up HTTP requests (from 40 ms per request to < 1 ms per request). 2010-02-24 19:53:22 -06:00
Dave Parks 74621ff8a8 Post-review cleanup. 2010-02-17 15:50:50 -06:00
Dave Parks de88d6ced4 Switched program database on windows to edit and continue for non-release builds.
Adding a debug watch to LLCurlRequest to avoid invalidating iterator on processing posts.
Mesh bulk uploading rewrite work in progress.
404 icons for mesh assets.
2010-02-17 11:29:16 -06:00
Dave Parks ffcbbf4aaa Multi-threaded asset uploading with proper ordering first draft. 2010-02-11 18:00:00 -06:00
Nat Goodspeed df7e5dd1dc DEV-35248: Allow NoVerifySSLCert to uniformly disable verification
Introduce static LLCurl SSL verification flag, default 'true', accessed by
LLCurl::setSSLVerify() and getSSLVerify().
Make LLCurl::Easy::prepRequest() check LLCurl::getSSLVerify() instead of
unconditionally setting CURLOPT_SSL_VERIFYPEER 'true'. Also set
CURLOPT_SSL_VERIFYHOST to match.
Make LLXMLRPCTransaction::Impl::init() examine LLCurl::getSSLVerify(), instead
of directly examining gSavedSettings.getBOOL("NoVerifySSLCert").
Make LLURLRequest::checkRootCertificate() set CURLOPT_SSL_VERIFYHOST as well
as CURLOPT_SSL_VERIFYPEER.
Make request() in llhttpclient.cpp (used by LLHTTPClient::getByteRange(),
head(), get(), getHeaderOnly(), put(), post(), postRaw(), postFile(), del(),
move()) pass LLCurl::getSSLVerify() to checkRootCertificate(), rather than
constant 'true'.
Make LLAppViewer::mainLoop() call
    LLCurl::setSSLVerify(! gSavedSettings.getBOOL("NoVerifySSLCert"))
at the same time it calls LLCurl::setCAFile(), a comparable bit of static
setup.
2010-01-20 15:48:13 -05:00
Steve Bennetts afe6350160 merge from texture-pipeline 2009-11-06 12:15:41 -08:00
Xiaohong Bao 35e200881c merge QAR-1829: texture pipeline branch in viewer-2.0.0.3 2009-11-06 06:52:24 +00:00
Bryan O'Sullivan cab31b572d Merge from trunk 2009-09-08 15:35:19 -07:00
Don Kjer 76d05a7e50 svn merge -r 129999:132607 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
2009-09-04 02:27:28 +00:00
Mark Palange 0274c1f2b1 Merged work for DEV-2066 (and formerly QAR-1538) in Viewer 2.
merged all changes, post copy, from the following branches:
linden/brachnes/enable-o-v
user/cg/qar-1538
user/mani/viewer2-enable-o-v
2009-07-16 17:54:58 +00:00
Roxanne Skelly 9e89819d55 DEV-34822 - merge with 1.23
certificate notification code
-r 118191

ignore-dead-branch
2009-07-08 00:45:17 +00:00