Skip to content
Snippets Groups Projects
  1. Apr 18, 2021
  2. Mar 10, 2021
  3. Oct 31, 2020
  4. Oct 29, 2020
  5. Aug 24, 2020
  6. Jul 27, 2020
  7. Jul 21, 2020
  8. Mar 30, 2020
  9. Mar 25, 2020
  10. Sep 07, 2018
  11. Sep 05, 2018
  12. Apr 22, 2017
  13. Nov 29, 2016
  14. Jul 22, 2016
  15. Jul 21, 2016
    • Nat Goodspeed's avatar
      MAINT-6584: Streamline static LLImageJ2C implementation API. · 71b593e8
      Nat Goodspeed authored
      Specifically, remove unused function pointer types CreateLLImageJ2CFunction,
      DestroyLLImageJ2CFunction and EngineInfoLLImageJ2CFunction.
      
      Also eliminate static fallbackDestroyLLImageJ2CImpl() and
      fallbackEngineInfoLLImageJ2CImpl(), leaving only static
      fallbackCreateLLImageJ2CImpl().
      
      We do need a factory function to instantiate the appropriate LLImageJ2CImpl
      subclass, so leave the fallbackCreateLLImageJ2CImpl() link seam in place.
      
      However, given that every known LLImageJ2CImpl subclass is cheap to
      instantiate, make getEngineInfo() a pure virtual method on that subclass: the
      static LLImageJ2C::getEngineInfo() method can temporarily construct an
      instance to query. While we're at it, make getEngineInfo() return std::string
      like LLImageJ2C::getEngineInfo(). It's ridiculous that
      fallbackEngineInfoLLImageJ2CImpl() implementations constructed a static
      std::string and returned its c_str(), only to have LLImageJ2C::getEngineInfo()
      construct ANOTHER std::string from the returned const char*.
      
      fallbackDestroyLLImageJ2CImpl() never did anything useful: it merely deleted
      the passed LLImageJ2CImpl subclass pointer as the specific subclass type. But
      since LLImageJ2CImpl's destructor is virtual, LLImageJ2C's destructor could
      simply delete the stored LLImageJ2CImpl*. In fact, make mImpl a
      boost::scoped_ptr<LLImageJ2CImpl> so we don't even have to delete it manually.
      71b593e8
  16. Feb 06, 2016
  17. Nov 10, 2015
  18. Aug 09, 2013
  19. Mar 29, 2013
  20. Oct 03, 2012
  21. Sep 21, 2012
  22. May 05, 2011
  23. Apr 05, 2011
  24. Apr 04, 2011
  25. Dec 24, 2010
  26. Oct 13, 2010
  27. Sep 21, 2010
  28. Aug 13, 2010
  29. 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
  30. Nov 06, 2009
  31. Jun 21, 2009
  32. May 08, 2009
  33. 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
  34. Jan 07, 2009
  35. Sep 22, 2008
  36. Aug 29, 2008
  37. Jun 02, 2008
  38. May 08, 2008
Loading