summaryrefslogtreecommitdiff
path: root/indra/llmessage/net.h
AgeCommit message (Collapse)Author
2013-03-29Update Mac and Windows breakpad builds to latestGraham Madarasz
2011-06-22Merge, fixed build issues by refactoring SOCKS 5 code.Logan Dethrow
2011-06-21Refactored SOCKS 5 handshake to use existing LLSocket class.Logan Dethrow
2011-06-10STORM-1112 First pass at cleanup of SOCKS 5 proxy code based on Linden ↵Logan Dethrow
Coding Standard and comments in the code review.
2011-03-28VWR-20801 Implement SOCKS 5 Proxy for the viewerRobin Cornelius
2010-08-13Change license from GPL to LGPL (version 2.1)Oz Linden
2009-04-09svn merge -r115000:116937 ↵Robert Knop
svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.26 Merging from server-1.26 to trunk Only a few conflicts: scripts/farm_distribute : the upload rate in trunk was even more conservative than the one I switched to in 1.26, so kept the trunk version. indra/llcommon/llversionserver.h : did svn revert to keep trunk indra/newsim/lltask.cpp : svn is weird. The merge conflict was one that it's not obvious why it was there. However, Simon and I looked at it, and the solution was obvious : keep the trunk blob where the conflict was flagged. indra/lib/python : conflict was differing versions of the eventlib extern. did svn revert . to keep trunk.
2009-01-19svn merge -r108236:108243 ↵Robert Knop
svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.25 Still merging from server-1.25... one day I will catch up! No conflicts
2009-01-08Result of svn merge -r107256:107258 ↵Aaron Brashears
svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165
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-06-21merge -r62831:64079 branches/maintenance to releaseKelly Washington
2007-01-02Print done when done.James Cook
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-17 03:13:04 +0000