summaryrefslogtreecommitdiff
path: root/indra/llmessage
AgeCommit message (Expand)Author
2011-07-28MergeLogan Dethrow
2011-07-28SH-2183 Fix for multi-threaded curl not playing nice with mesh upload.Dave Parks
2011-07-25merging latest viewer-development to mesh merge candidate.Nyx (Neal Orman)
2011-07-22SH-2031 Fix for sometimes deadlocking a curl thread.Dave Parks
2011-07-22SH-2031 Cleanup from threaded curl implementation (remove errors/loops on shu...Dave Parks
2011-07-21SH-2031 Followup to curl threading work -- don't start and stop the thread on...Dave Parks
2011-07-21SH-2031 Don't do network I/O from the main thread in llcurl.Dave Parks
2011-07-21STORM-1112 Protected LLProxy members during cross-thread calls to LLProxy::ap...Logan Dethrow
2011-07-19STORM-1112 Added LLProxy::applyProxySettings() to apply proxy settings to cur...Logan Dethrow
2011-07-15Merge from viewer-developmentXiaohong Bao
2011-07-13Code cleanup for the SOCKS 5 proxy viewer.Logan Dethrow
2011-07-13mergeBrad Payne (Vir Linden)
2011-07-13STORM-1112 Fixed network buffers that need to have space for the SOCKS proxy ...Logan Dethrow
2011-07-12mergeLogan Dethrow
2011-07-09mergeBrad Payne (Vir Linden)
2011-07-09Automated merge with http://hg.secondlife.com/viewer-developmentNat Goodspeed
2011-07-07CHOP-661: Fix HTTPServer usage to turn off allow_reuse_address.Nat Goodspeed
2011-07-07Merge latest from viewer trunksimon@lindenlab.com
2011-07-06Changed lllog messages in llproxy.cpp to new macros.Logan Dethrow
2011-07-05STORM-1112 Fixed crash on quit. Other minor fixes:Logan Dethrow
2011-07-01ER-1016 - "Remove ability for anyone to edit terrain" and ER-910 "Parcelsimon@lindenlab.com
2011-07-01merge viewer-development -> mesh-developmentBrad Payne (Vir Linden)
2011-06-30MergeLogan Dethrow
2011-06-29merge changes for storm-1368Oz Linden
2011-06-28STORM-1112 More cleanup of SOCKS 5 proxy code.Logan Dethrow
2011-06-27STORM-1446 Portability fix when setting non-blocking socket options.Aaron Stone
2011-06-22Merge, fixed build issues by refactoring SOCKS 5 code.Logan Dethrow
2011-06-21MergeLogan Dethrow
2011-06-21Refactored SOCKS 5 handshake to use existing LLSocket class.Logan Dethrow
2011-06-21Merge with latest lindenlab/viewer-developmentsimon@lindenlab.com
2011-06-20fix for SH-1870: can not upload book_collection_1.dae when include texturesXiaohong Bao
2011-06-20ER-944: Add feature to control user sounds on a parcel. Added new checkboxessimon@lindenlab.com
2011-06-16Merge with latest lindenlab/viewer-developmentsimon@lindenlab.com
2011-06-14mergeBrad Payne (Vir Linden)
2011-06-10STORM-1112 First pass at cleanup of SOCKS 5 proxy code based on Linden Coding...Logan Dethrow
2011-06-09ER-910: Parcel Privacy. Rename things in code to reflect feature name change...Dave SIMmONs
2011-06-08Merged STORM-1112 with viewer-development. Fixed license in socks5.cpp and s...Logan Dethrow
2011-06-03automated mergeRoxie Linden
2011-05-27transplant fix for SH-1467Roxie Linden
2011-05-24Merge latest from lindenlab/viewer-developmentDave SIMmONs
2011-05-23CHOP-661: Add information to try to zero in on remaining failures.Nat Goodspeed
2011-05-18fix for SH-1591: crash at LLVOCacheEntry::~LLVOCacheEntry() line 138Xiaohong Bao
2011-05-16Merge latest from lindenlab/viewer-developmentDave SIMmONs
2011-05-16mergeDave Parks
2011-05-12mergeDave Parks
2011-05-12Merge lindenlab/viewer-developmentDave SIMmONs
2011-05-10CHOP-661: add and use code to listen on next available server port.Nat Goodspeed
2011-05-04EXP-772 -- Log in failure, keeps saying DNS cannot resolve hostname.Leslie Linden
2011-05-02ER-858: Add viewer checkbox to toggle parcel privacy settings. Reviewed by K...Dave SIMmONs
2011-05-02mergeDave Parks