Commit Graph

13 Commits (680194deaf7a35caaa629abc16e886d71baff636)

Author SHA1 Message Date
Richard Linden a2e22732f1 Summer cleaning - removed a lot of llcommon dependencies to speed up build times
consolidated most indra-specific constants in llcommon under indra_constants.h
fixed issues with operations on mixed unit types (implicit and explicit)
made LL_INFOS() style macros variadic in order to subsume other logging methods
such as ll_infos
added optional tag output to error recorders
2013-07-30 19:13:45 -07:00
Graham Madarasz bf6182daa8 Update Mac and Windows breakpad builds to latest 2013-03-29 07:50:08 -07:00
Logan Dethrow f91d40c259 Merge, fixed build issues by refactoring SOCKS 5 code. 2011-06-22 14:35:31 -04:00
Logan Dethrow 20100ba38c Refactored SOCKS 5 handshake to use existing LLSocket class. 2011-06-21 17:09:12 -04:00
Logan Dethrow 6ce2c20a06 STORM-1112 First pass at cleanup of SOCKS 5 proxy code based on Linden Coding Standard and comments in the code review. 2011-06-10 17:34:00 -04:00
Robin Cornelius 74d9bf0d55 VWR-20801 Implement SOCKS 5 Proxy for the viewer 2011-03-28 11:20:06 +01:00
Oz Linden 06b0d72efa Change license from GPL to LGPL (version 2.1) 2010-08-13 07:24:57 -04:00
Robert Knop fa121d8ee1 svn merge -r115000:116937 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-04-09 00:20:15 +00:00
Robert Knop ce888706c5 svn merge -r108236:108243 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-19 22:05:19 +00:00
Aaron Brashears e3cf284388 Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 2009-01-08 00:05:06 +00:00
Aaron Brashears 5595a99623 Result of svn merge -r71162:71205 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-04 23:19:43 +00:00
Kelly Washington e03bb0606a merge -r62831:64079 branches/maintenance to release 2007-06-21 22:40:22 +00:00
James Cook 420b91db29 Print done when done. 2007-01-02 08:33:20 +00:00