Skip to content
Snippets Groups Projects
  1. Aug 09, 2013
  2. Mar 29, 2013
  3. Oct 03, 2012
  4. Sep 21, 2012
  5. May 05, 2011
  6. Apr 05, 2011
  7. Apr 04, 2011
  8. Dec 24, 2010
  9. Oct 13, 2010
  10. Sep 21, 2010
  11. Aug 13, 2010
  12. Feb 03, 2010
    • Tofu Linden's avatar
      CID-261 · d182b4f1
      Tofu Linden authored
      Checker: UNINIT_CTOR
      Function: LLImageJ2COJ::LLImageJ2COJ()
      File: /indra/llimagej2coj/llimagej2coj.cpp
      d182b4f1
  13. Nov 06, 2009
  14. Jun 21, 2009
  15. May 08, 2009
  16. 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
  17. Jan 07, 2009
  18. Sep 22, 2008
  19. Aug 29, 2008
  20. Jun 02, 2008
  21. May 08, 2008
  22. Mar 25, 2008
  23. Dec 28, 2007
  24. Oct 11, 2007
  25. Oct 04, 2007
  26. Sep 28, 2007
  27. Aug 21, 2007
  28. Apr 04, 2007
  29. Mar 30, 2007
  30. Mar 16, 2007
  31. Mar 02, 2007
  32. Jan 10, 2007
Loading