Skip to content
Snippets Groups Projects
  1. Jun 09, 2009
  2. Jun 04, 2009
    • Nat Goodspeed's avatar
      DEV-32777: Use a canonical boost::coroutines::coroutine signature, relying on · 820d4a20
      Nat Goodspeed authored
      boost::bind() to pass any other coroutine arguments. This allows us to remove
      the LLCoroBase and LLCoro constructs, directly storing a coroutine object in
      our ptr_map. It also allows us to remove the multiple launch() overloads for
      multiple arguments. Finally, it lets us move most launch() functionality into
      a non-template method.
      820d4a20
  3. Jun 03, 2009
    • Nat Goodspeed's avatar
      DEV-32777: Introduce LLCoros, an LLSingleton registry of named coroutine · 285613b8
      Nat Goodspeed authored
      instances. LLCoros::launch() intends to address three issues:
      - ownership of coroutine instance
      - cleanup of coroutine instance when it terminates
      - central place to twiddle MSVC optimizations to bypass DEV-32777 crash.
      Initially coded on Mac; will address the third bullet on Windows.
      Adapt listenerNameForCoro() to consult LLCoros::getName() if applicable.
      Change LLLogin::Impl::connect() to use LLCoros::launch().
      LLCoros::getName() relies on patch to boost::coroutines::coroutine::self to
      introduce get_id().
      285613b8
  4. May 28, 2009
  5. May 27, 2009
  6. May 26, 2009
  7. May 22, 2009
    • Brad Kittenbrink's avatar
      DEV-27646 dll linkage for login module. · 01d39082
      Brad Kittenbrink authored
      Ok, finally got this to a point where it doesn't break the build and I can check
      in. llcommon can be built as a shared library (disabled but can be enabled with
      cmake cache var LLCOMMON_LINK_SHARED.
      
      reviewed by Mani on tuesday (I still need to get his suggested changes
      re-reviewed)
      01d39082
  8. May 13, 2009
  9. May 11, 2009
  10. May 08, 2009
  11. May 07, 2009
  12. May 04, 2009
  13. Apr 21, 2009
  14. Apr 16, 2009
  15. 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
  16. Apr 01, 2009
  17. Mar 24, 2009
  18. Mar 20, 2009
  19. Mar 09, 2009
  20. Mar 04, 2009
  21. 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
  22. Feb 24, 2009
  23. Feb 18, 2009
  24. Feb 06, 2009
    • Robert Knop's avatar
      svn merge -r 108748:109731 svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.25 · ea8e8327
      Robert Knop authored
      Merge server 1.25 back to trunk
      
      Conflicts:
      
      C    indra/llcommon/llversionserver.h  : svn reverted
      
      C    indra/tools/bill/MoneyMachine.pm : one conflict, only difference
                                              was a blank line.
      
      C    indra/newsim/lllslmanager.cpp : kept merge-right, in consultation
      C    indra/newsim/lllslmanager.h   :   with babbage
      C    indra/newsim/llagentinfo.cpp  : (runNested, not runSpecial)
      
      C    indra/test/test_entity_query.py        : Kept merge-right
      C    indra/test/test_agent_linden_dollar.py : Kept merge-right
                        --> Kartic fixed these testes in server-1.25
      
      C    indra/test/template/httpd.tmpl : Kept merge-right
                                            (the IfModule version)
      ea8e8327
  25. Feb 03, 2009
  26. Jan 26, 2009
  27. Jan 19, 2009
    • Robert Knop's avatar
      Merging from the server/server-1.25 branch · f1380f2f
      Robert Knop authored
      svn merge -r107352:108210
      svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.25
      
      Merge conflicts were resolved:
      
        scripts/start-server   : one conflict, kept the "working" version
      
        indra/llcommon/llversionserver.h : reverted
        indra/newview/Info-SecondLife.plist : reverted
        indra/newview/res/viewerRes.rc : reverted
      
        indra/newsim/llagentinfo.cpp : kept *both*... "working" had
            is_agent_online, which nothing else had, and the merge had
            isGodAllowed(), part of SEC resolution
      
        indra/backbone/agent_router.py : kartic & rdw merged and reviewed
            using brains and things
      
        indra/newsim/llsimhttpresponder.cpp : doesn't exist in trunk, and
            that's OK (even though there was a change for it)
      f1380f2f
  28. Jan 16, 2009
  29. Jan 08, 2009
    • Robert Knop's avatar
      svn merge -r104838:107352 svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.25 · cc2f19eb
      Robert Knop authored
      NOTE : also ran
        scripts/update_version_files.py --verbose --server --server_channel="Second Life Server"
      
      to update server version information before doing a compile test.
      Committed with the results of this version file update.
      
      Conflicts resolved by prospero:
      
      scripts/maintenance/update-groups.py  :  kept the trunk version (was
                                               merged from Rad Chillies)
      
      scripts/make_deploy_group.py : merge by hand (I'm the one to do this,
                                     anyway)
      
      indra/llcommon/llversionserver.h : kept trunk version
      
      indra/newsim/llgettaskstats.cpp : kept trunk version.  (svn revert)This
                                        was imported late into 1.25, after the
                                        branch merged into trunk, and no
                                        changes were made in the 1.25 branch
                                        after the import.
      
      indra/newsim/llparcelstats.cpp : same as llgettaskstats.cpp
      indra/newsim/llscriptcounter.h : same as llgettaskstats.cpp
      
      indra/newsim/llagentinfo.cpp : like llgettaskstats.cpp, but more
                                     complicated as some of soft's God-logging
                                     that came from 1.24->1.25 was in here.
                                     Fortunately, the conflict was trivial
                                     (missing include)
      
      idnra/newsim/simulator.cpp : one small conflict.  Kept the 1.25 version
                                   of SKU/product stuff, as it was likely part
                                   of the homestead stuff that was recently
                                   put into 1.25.  However, there was some
                                   code after that in the merge conflict that
                                   had been removed from trunk that I also
                                   removed in the resolution.  This code is 27
                                   lines starting at the comment "Asset cache
                                   service", as can be found in the
                                   server-1.25 branch.
      
      indra/newsim/tests/fakeobjects.h : kept the trunk version.  No changes
                                         to 1.25 after parcel stats merge,
                                         except for a compile error fixed by
                                         andrew about which he warned there
                                         would be merge issues...
      
      indra/newsim/tests/llgettaskstats_test.cpp : same as llgettaskstats.cpp
      indra/newsim/tests/lllslmanager_tests.cpp : same as llgettaskstats.cpp
      indra/newsim/tests/llparcelstats_test.cpp : same as llgettaskstats.cpp
      indra/newsim/llgettaskstats.h : same as llgettaskstats.cpp
      indra/newsim/llparcelstats.h : same as llgettaskstats.cpp
      
      indra/newsim/llscriptdata.cpp : same as llgettaskstats.cpp, except for a
                                      fix that josh made both to trunk and
                                      1.25
      indra/newsim/llscriptdata.h : same as llscriptdata.cpp
      
      indra/newsim/llscriptcounter.cpp : same as llgettaskstats.cpp
      
      indra/newsim/CMakeLists.txt : similar to llgettaskstats.cpp, except that
                                    there was an additional change to trunk
                                    (so doing "svn revert" to keep trunk is
                                    still the right thing)
      
      indra/backbone/multiagentchat.py : where there were conflicts, kept the
                                         server-1.25 version.  Phoenix had put
                                         in some fixes for dealing with
                                         omissions of the accept header in the
                                         1.25 branch.
      
      indra/backbone/group_linden_dollar.py : similar to multiagentchat.py.
                                              All but one or two conflicts
                                              were utterly trivial (missing
                                              blank line)
      
      indra/backbone/agent_linden_dollar.py : all merge conflicts were utterly
                                              trivial (missing blank line);
                                              I'm surprised svn got all fussy
                                              about them.
      
      indra/lib/python : conflict was because the externals had been futzed
                         with in 1.25 during debugging of backbone memory
                         bloat.  Kept the externals as in trunk.
      cc2f19eb
  30. Jan 07, 2009
  31. Jan 05, 2009
Loading