summaryrefslogtreecommitdiff
path: root/indra/llmessage/CMakeLists.txt
AgeCommit message (Collapse)Author
2011-03-11sync up to latest viewer-developmentOz Linden
2011-03-03Autobuild : Fix llsdmessage integration test failure on MacMerov Linden
2011-02-16fix for INTEGRATION_TEST_llcapabilitylistener (include Python to run with ↵Alain Linden
correct python executable).
2010-05-06DEV-49633 fixed, use Cache-Control max-age for display name expirationJames Cook
We have no C++ libraries for parsing RFC 1123 dates, so parsing "Expires" headers is risky. max-age delta-seconds is easier to parse and equivalent for this use. Also added unit tests for max-age parsing. Pair-programmed with Huseby.
2010-02-11Created stub LLAvatarNameCache for display name lookup, asJames Cook
well as LLAvatarName base data object. Reviewed with Kelly.
2009-11-28Migrated LLUUIDs and some float constants out of headers into .cpp filesJames Cook
Moved some functions with llinfos into .cpp files Linker optimizations, all
2009-11-27Add CMake var LL_TESTS to optionally disable tests for build timingJames Cook
2009-11-27Move sound id declarations to cpp file to reduce redundant linker symbols.James Cook
Cuts size of object files dramatically, often 100KB apiece.
2009-10-19mergeSteve Bennetts
2009-10-16merge from latest svn/viewer-2-0 to hg/viewer-2-0Mark Palange (Mani)
2009-10-16DEV-41406 resurrect dead llpartdata test, turn it into a llmessage ↵Adam Moss
integration test.
2009-10-16DEV-41405 convert llxfer test to a llmessage integration test.Adam Moss
2009-10-15DEV-41363 convert legacy llhost tut test into a llmessage integration test.Adam Moss
2009-10-15DEV-41355 convert llmime monolithic tut test to a llmessage unit test.Adam Moss
2009-10-12DEV-41174 more automated testing loveAdam Moss
* turn llnamevalue_tut into a llmessage unit test * turn llsdserialize_tut into a llcommon integration test * re-enable the (quite slow) llsdserialize test on win32 now that it doesn't have to run on every recompile * re-enable all llmessage unit tests on linux viewer builds
2009-09-18Merged latest viewer/viewer-20 into login-api.brad kittenbrink
2009-09-10Fix a link error with an integration test on OS X.Bryan O'Sullivan
2009-09-08MergeBryan O'Sullivan
2009-09-01Fixup for closing paren dropped in the merge.brad kittenbrink
2009-09-01Merged login-api with viewer-2.0.0-3 up through r132290.brad kittenbrink
2009-09-01DEV-34522: [COMMENTS ONLY] clean up comments about (formerly) disabled testsNat Goodspeed
2009-08-31Merge with trunkBryan O'Sullivan
2009-08-28DEV-38596: Introduce Mani's LL_ADD_INTEGRATION_TEST macro.Nat Goodspeed
LL_ADD_INTEGRATION_TEST supports tests that may require linking against one or more Linden libraries, or that should be executed with a wrapper script. Use this to test lllazy.cpp, llsdmessage.cpp and llcapabilitylistener.cpp.
2009-07-10Expanded tabs in cmake filespalmer@945battery-guestB-224.lindenlab.com
2009-07-01svn merge -r125825:125901 svn+ssh://svn.lindenlab.com/svn/user/cg/qar-1654Christian Goetze
QAR-1654 merge completed.
2009-06-23Removed conflict markers (ie. <<<<<<<) in llmessage/CMakeLists.txtMark Palange (Mani)
Copied snprintf declaration in llstring from login-api-3
2009-06-23Resolve mergeNat Goodspeed
2009-06-23Incomplete attempt to clean up Mercurial branch buildNat Goodspeed
2009-06-23Fixed an "ADD_BUILD_TEST" leftover from the initial merge.palange@becane.lindenlab.com
2009-06-22Merge with viewer-2.0.0-3 branchBryan O'Sullivan
2009-06-19result of "svn merge -r123757:124890 ↵Paul Oppenheim
svn+ssh://svn.lindenlab.com/svn/linden/branches/improve-unit-testing/iface-04" for QAR-1496
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-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-03-02Clean up use of tutBryan O'Sullivan
2009-02-25svn merge -r108815:112761 ↵Robert Knop
svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.26 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) { }
2008-08-29Switch more libraries over to target_link_librariesBryan O'Sullivan
2008-06-02svn merge -r88066:88786 ↵Bryan O'Sullivan
svn+ssh://svn.lindenlab.com/svn/linden/branches/cmake-9-merge dataserver-is-deprecated for-fucks-sake-whats-with-these-commit-markers
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-14 22:57:19 +0000