Skip to content
Snippets Groups Projects
  1. Apr 29, 2024
  2. Aug 10, 2021
  3. Jun 26, 2021
  4. Dec 17, 2020
  5. Nov 11, 2020
  6. Oct 10, 2020
  7. Oct 08, 2020
  8. Aug 09, 2020
  9. Nov 10, 2015
  10. Aug 09, 2013
  11. May 05, 2013
  12. Mar 29, 2013
  13. Nov 15, 2012
    • Richard Linden's avatar
      SH-3406 WIP convert fast timers to lltrace system · 9d77e030
      Richard Linden authored
      cleaning up build
      moved most includes of windows.h to llwin32headers.h to disable min/max macros, etc
      streamlined Time class and consolidated functionality in BlockTimer class
      llfasttimer is no longer included via llstring.h, so had to add it manually in several places
      9d77e030
  14. Jul 13, 2011
  15. Jun 28, 2011
  16. Jun 22, 2011
  17. Jun 21, 2011
  18. Jun 10, 2011
  19. Mar 28, 2011
  20. Oct 13, 2010
  21. Sep 21, 2010
  22. Aug 13, 2010
  23. Apr 08, 2009
    • Robert Knop's avatar
      svn merge -r115000:116937 svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.26 · fa121d8e
      Robert Knop authored
      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.
      fa121d8e
  24. Feb 25, 2009
    • Robert Knop's avatar
      svn merge -r108815:112761 svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.26 · c88b470a
      Robert Knop authored
      The biggest things in this are Scalable Space Servers and Maint-Server-6
      
      QAR-1209 : SSS
      QAR-1295 : maint-server-6
      
      Conflicts resolved by prospero:
      
      C    scripts/farm_distribute
      
      C    scripts/automated_build_scripts/build-linux.sh : resolved by
                           prospero, mostly kept the merge-right version in
                           the conflict, but there was one block of repeated
                           code from earlier that I removed.
      
      C    scripts/automated_build_scripts/build-mac.sh : kept merge-right
      
      C    indra/llcommon/llversionserver.h : svn revert
      
      C    indra/newsim/llsimparcel.h : kept *both*... working had "setArea",
                          merge-right had exportStream and importStream
      
      C    indra/newsim/llsimparcel.cpp : see llsimparcel.h
      
      C    indra/newsim/lltask.h : working had LLTask derived also from
                         LLScriptResourceConsumer, merge-right had LLTask
                         dervied also from LLAgentPosition.  To resolve
                         conflict, derive from both.
      
      C    indra/newsim/lllslmanager.h : kept merge-right (had an added comment)
      
      C    indra/llmessage/llhttpnode.h : kept working (added the definition
                         of method LLHTTPNode::extendedResult)
      
      C    indra/lscript/lscript_execute_mono/llscriptexecutemono.cpp
      C    indra/lscript/lscript_execute_mono/llscriptexecutemono.h
                        : These two were resolved by si, in consultation with daveh
      
      
      I also had to add the following stubs to
      indra/newsim/tests/llgodkickutils_test.cpp in order to get it to
      compile:
      
        // LLScriptResourceConsumer interface methods in LLTask
        LLScriptResource::LLScriptResource() { }
        LLScriptResourcePool::LLScriptResourcePool() { }
        LLScriptResourcePool LLScriptResourcePool::null;
      
        LLScriptResourceConsumer::LLScriptResourceConsumer() { }
        LLScriptResourcePool& LLScriptResourceConsumer::getScriptResourcePool() { return LLScriptResourcePool::null; }
        const LLScriptResourcePool& LLScriptResourceConsumer::getScriptResourcePool() const { return LLScriptResourcePool::null; }
        bool LLScriptResourceConsumer::switchScriptResourcePools(LLScriptResourcePool& new_pool) { return false; }
        bool LLScriptResourceConsumer::canUseScriptResourcePool(const LLScriptResourcePool& resource_pool) { return false; }
        bool LLScriptResourceConsumer::isInPool(const LLScriptResourcePool& resource_pool) { return false; }
        void LLScriptResourceConsumer::setScriptResourcePool(LLScriptResourcePool& pool) { }
      
        S32 LLTask::getUsedPublicURLs() const { return 0; }
        void LLTask::setScriptResourcePool(LLScriptResourcePool& pool) { }
      c88b470a
  25. Jan 19, 2009
  26. Jan 07, 2009
  27. May 14, 2008
  28. Oct 04, 2007
  29. Jul 02, 2007
  30. Jun 21, 2007
  31. May 01, 2007
  32. Feb 02, 2007
  33. Jan 03, 2007
  34. Jan 02, 2007
Loading