Skip to content
Snippets Groups Projects
  1. Nov 10, 2015
  2. Jun 05, 2013
  3. Mar 29, 2013
  4. Oct 13, 2010
  5. Sep 21, 2010
  6. Sep 17, 2010
  7. Aug 13, 2010
  8. Apr 07, 2010
  9. Feb 08, 2010
  10. Nov 23, 2009
  11. Oct 28, 2009
  12. Aug 28, 2009
  13. Aug 26, 2009
  14. Jun 30, 2009
  15. Jun 21, 2009
  16. May 08, 2009
  17. 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
  18. Jan 07, 2009
  19. Oct 04, 2007
  20. Jan 02, 2007
Loading