summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2009-06-04Fix licensing, also make the unzipping quieter, so that license error ↵Christian Goetze
messages are easier to see in the log.
2009-06-04Merge of QAR-1383 event-system-7 into trunk.Brad Kittenbrink
svn merge -r 121797:121853 svn+ssh://svn.lindenlab.com/svn/linden/branches/merge-event-system-7
2009-06-04DEV-32777: Use a canonical boost::coroutines::coroutine signature, relying onNat Goodspeed
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.
2009-06-04DEV-32777: When launching login coroutine, instead of binding _2, _3Nat Goodspeed
placeholders and then asking Boost.Coroutine to pass parameters to them, simply bind the desired values.
2009-06-04DEV-32777: Make coroutine's top-level function accept value params, notNat Goodspeed
reference params.
2009-06-03Remove -parallelizeTargets from xcodebuild invocation, it seems to not work ↵Christian Goetze
well enough
2009-06-03DEV-32777: update Boost.Coroutine for Windows tooNat Goodspeed
2009-06-03DEV-32777: Introduce LLCoros, an LLSingleton registry of named coroutineNat Goodspeed
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().
2009-06-02Merge with SVN trunkBryan O'Sullivan
2009-06-02Small brainoBryan O'Sullivan
2009-05-29Merge with SVN trunkBryan O'Sullivan
2009-05-29Added new LL_COMMON_API dll export declaration for new llsd_equals function.Brad Kittenbrink
2009-05-28DEV-31892: rev 119315 got lost somewhere along the way?! Reapplying.Nat Goodspeed
2009-05-28DEV-32777: ensure that stack objects listening on persistent LLEventPumps getNat Goodspeed
properly disconnected when destroyed. Break out Debug class and associated macros from lleventcoro_test.cpp into test/debug.h. Add Debug output to lllogin_test.
2009-05-27DEV-31979: Introduce LLReqID, a class to help individual event API listenersNat Goodspeed
implement the ["reqid"] convention. This convention dictates that a response LLSD from each such API should contain a ["reqid"] key whose value echoes the ["reqid"] value, if any, in the request LLSD. Add LLReqID support to LLAresListener's "rewriteURI" service, LLSDMessage, LLCapabilityListener and LLXMLRPCListener.
2009-05-27Fix minor Mac build breakage (missing #include)Nat Goodspeed
2009-05-27Fix for mac build errors following r121524 commit for DEV-27646.Brad Kittenbrink
2009-05-26Add llsd_equals(), a function whose absence sorely puzzles meNat Goodspeed
2009-05-22DEV-27646 dll linkage for login module.Brad Kittenbrink
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)
2009-05-22svn merge -r121194:121210Adam Moss
svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-1.23.onetwo-merge-1 QAR-1531 viewer 1.23rc1+1.23rc2 merge to trunk
2009-05-21Merge with SVN trunkBryan O'Sullivan
2009-05-21Put the os.environ["DISTCC"] = ... call into main()Christian Goetze
2009-05-21Fix develop.py putenv bug, use new etch build-linux hosts for parabuild.Christian Goetze
2009-05-21os.putenv doesn't do what we want, replaced with os.environ instead.David Kaprielian
2009-05-20Merge with SVN trunkBryan O'Sullivan
2009-05-20Windows: make dbghelp.dll an installable packageBryan O'Sullivan
Reviewed by Mani.
2009-05-19Fix to develop.py to build on 64 bit windows.Mark Palange
Added March 2009 DirectX SDK to cmake config. Reviewed by brad
2009-05-19Merge with SVN trunkBryan O'Sullivan
2009-05-19Now that 1.27 has branched away, bumping the version number to 1.29 toRobert Knop
mean "the development version between release versions 1.27 and 1.30".
2009-05-19svn merge -r118673:120720 ↵Robert Knop
svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.26 Merging server-1.26 back to trunk. Two conflicts -- llversionserver.hh (kept the trunk version) and in llsimparcelmgr.cpp -- also kept the trunk version. There was some code in 1.26 that included error printing from RDW that says "we should really not be hitting this code", and that code was gone in trunk... so, went ahead and kept the trunk part of that one conflict in that file.
2009-05-19Adding back the setting of "DEBUG", the lack of which caused many unitRobert Knop
tests to fail.
2009-05-18Result of svn merge -r119432:120464 ↵Aaron Brashears
svn+ssh://svn/svn/linden/branches/http_database/merge-03 into trunk. QAR-1462
2009-05-14Set DISTCC_DIR to a location inside the source tree to avoid causing NFS ↵Christian Goetze
trouble with the default setting.
2009-05-14Max out distcc jobs to 12 in develop.pyChristian Goetze
2009-05-14Remove silly std::cout debugging outputNat Goodspeed
2009-05-14There are 71 eniacs, not just 64Christian Goetze
2009-05-14Make develop.py work on eniacs the same way it works on stationsChristian Goetze
2009-05-13svn merge -r113003:119136 ↵Nat Goodspeed
svn+ssh://svn.lindenlab.com/svn/linden/branches/login-api/login-api-2 svn+ssh://svn.lindenlab.com/svn/linden/branches/login-api/login-api-3 (finish)
2009-05-13Any static instance of an STL container introduces static-initializer-orderNat Goodspeed
bugs. Use internal, informal singleton pattern to work around that.
2009-05-11Another line ending changeBryan O'Sullivan
2009-05-11Merge with SVN trunkBryan O'Sullivan
2009-05-11Switch the XML file line endings to native.Bryan O'Sullivan
2009-05-11svn merge -r113003:119136 ↵Nat Goodspeed
svn+ssh://svn.lindenlab.com/svn/linden/branches/login-api/login-api-2 svn+ssh://svn.lindenlab.com/svn/linden/branches/login-api/login-api-3
2009-05-08svn merge -r114679:114681 ↵Nat Goodspeed
svn+ssh://svn.lindenlab.com/svn/linden/branches/event-system/event-system-7 svn+ssh://svn.lindenlab.com/svn/linden/branches/event-system/event-system-8
2009-05-08merge skinning-7 -r 119501-119577 -> viewer-2.0.0-1 *NOTE: This overlaps a ↵Steven Bennetts
little with the skinning-7 -> skinning-8 merge of 119500-119692 -- James ignore-dead-branch
2009-05-08Replaced combo_item with combo_box.item and converted contents labels into ↵Steven Bennetts
label attributes for all translations.
2009-05-08merge trunk@116587 skinning-7@119389 -> viewer-2.0.0-skinning-7Steven Bennetts
2009-05-08Update version to 2.0.0.0 !!!Steven Bennetts
2009-05-06Merge with SVN trunkBryan O'Sullivan
2009-05-04QAR-1476 Combo-merge to trunk: Viewer 1.23 RC0 and Simulator 1.26.3Adam Moss
svn merge -r118927:118939 svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-1.23.0-merge-2-combo-QAR-1476 this is a composite of... svn merge -r115088:118182 svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer_1-23 conflicts resolved: C doc/contributions.txt C indra/llaudio/audioengine.cpp C indra/newview/CMakeLists.txt C indra/newview/llfloaterlandholdings.cpp C indra/newview/llpaneldirbrowser.cpp C indra/newview/llpanelgrouplandmoney.cpp C indra/newview/llpreviewscript.cpp C indra/newview/llviewermenu.cpp C indra/newview/skins/default/xui/en-us/notifications.xml and... svn merge -r116937:118673 svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.26 minor-to-trivial conflicts resolved: C indra/llcommon/llversionserver.h C indra/newsim/llrezdata.cpp C indra/newsim/llstate.cpp C indra/upgrade/schema_version/sequence/3/index_log_paypal.sql
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-15 09:28:41 +0000