Skip to content
Snippets Groups Projects
  1. Dec 16, 2014
  2. Dec 15, 2014
  3. Dec 08, 2014
  4. Dec 09, 2013
  5. Sep 24, 2013
  6. Mar 29, 2013
  7. Aug 27, 2012
  8. Aug 16, 2012
  9. Aug 02, 2012
  10. Apr 15, 2011
  11. Apr 11, 2011
  12. Apr 01, 2011
  13. Mar 31, 2011
  14. Mar 03, 2011
  15. Sep 21, 2010
  16. Jul 09, 2010
  17. Jul 01, 2010
  18. Apr 22, 2010
  19. Apr 02, 2010
  20. Apr 01, 2010
  21. Mar 31, 2010
  22. Mar 26, 2010
  23. Feb 11, 2010
  24. Jan 19, 2010
  25. Oct 16, 2009
  26. Sep 17, 2009
  27. Sep 04, 2009
  28. Jul 29, 2009
  29. Jul 23, 2009
  30. Jun 24, 2009
  31. May 19, 2009
    • Robert Knop's avatar
      svn merge -r118673:120720 svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.26 · 9a8d0699
      Robert Knop authored
      Merging server-1.26 back to trunk.
      
      Two conflicts -- llversionserver.hh (kept the trunk version)
      
      and in llsimparcelmgr.cpp -- also kept the trunk version.  There was
                                   some code in 1.26 that included error
                                   printing from RDW that says "we should
                                   really not be hitting this code", and that
                                   code was gone in trunk... so, went ahead
                                   and kept the trunk part of that one
                                   conflict in that file.
      9a8d0699
Loading