summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2009-06-25Merge with trunkBryan O'Sullivan
2009-06-25Ignore distcc state directoryBryan O'Sullivan
2009-06-25Merge with SVN login-api-3 branchBryan O'Sullivan
2009-06-25Fix remaining Mac build errorsNat Goodspeed
2009-06-24Mercurial build: minor tweaks to fix some Mac build errorsNat Goodspeed
2009-06-24two more llstartup.cpp merge issues.Mark Palange (Mani)
2009-06-24Commiting merged llstartup.cpp, again?Mark Palange (Mani)
2009-06-24DEV-31980: remove cruft from lleventdispatcher.hNat Goodspeed
2009-06-24Fix Mac BuildChristian Goetze
2009-06-24DEV-31980: Extend LLEventDispatcher to handle const as well as non-constNat Goodspeed
methods. Introduce LLAppViewerListener based on LLDispatchListener, instantiate a static one in llappviewer.cpp. Initial implementation only supports ["op"] == "requestQuit".
2009-06-23A few more merge error fixes.Mark Palange (Mani)
2009-06-23Removed conflict markers (ie. <<<<<<<) in llmessage/CMakeLists.txtMark Palange (Mani)
Copied snprintf declaration in llstring from login-api-3
2009-06-24QAR-1619 Fixing linux build error re: llui_libtest linkageMark Palange
2009-06-23Resolve mergeNat Goodspeed
2009-06-23Incomplete attempt to clean up Mercurial branch buildNat Goodspeed
2009-06-23QAR-1619: For some reason the LLWindowMesaHeadless constructor omitted theNat Goodspeed
LLWindowCallbacks* parameter passed by its consumer and required by the base-class LLWindow constructor.
2009-06-23QAR-1619: make assemblies/3rd_party_libs/linux64/boost.txt reference .a libsNat Goodspeed
that are actually present. Update linux and linux64 boost tarballs with previous Windows, Mac patch.
2009-06-23QAR-1619: fix Linux-only missing #include (Linux-only reference to LLTrans)Nat Goodspeed
2009-06-23Fixed an "ADD_BUILD_TEST" leftover from the initial merge.palange@becane.lindenlab.com
2009-06-22Fix up some mismerged pieces of install.xmlBryan O'Sullivan
2009-06-22Switch to new unit test infrastructureBryan O'Sullivan
2009-06-22Merge with trunkBryan O'Sullivan
2009-06-22Merge with SVN trunkBryan O'Sullivan
2009-06-22Python 2.4 and 2.6 improvementsBryan O'Sullivan
The sets module is no longer needed with Python 2.4, and causes a DeprecationWarning with 2.6, so drop it The md5 module causes a DeprecationWarning with 2.6, so try to import hashlib (its replacement) instead, else fall back Reviewed by Poppy.
2009-06-22Merge with trunkBryan O'Sullivan
2009-06-22Merge with viewer-2.0.0-3 branchBryan O'Sullivan
2009-06-22Merge with SVN trunkBryan O'Sullivan
2009-06-22QAR-1383: convert new uses of Boost.Signals (arriving from other branches) toNat Goodspeed
Boost.Signals2 like the rest of the event-system-n code.
2009-06-22trivial comment fixes for typos that were bugging me...Adam Moss
2009-06-21Modified RecordToChatConsole to not construct LLFloaterChat if it doesn't ↵Steven Bennetts
already exist to avoid recursive floater construction.
2009-06-21Fixed a shutdown crash.Steven Bennetts
2009-06-21merge -r 124105-124625 skinning-13 -> viewer-2.0.0-3Steven Bennetts
2009-06-21merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3Steven Bennetts
ignore-dead-branch
2009-06-20svn merge -r124872:124873Adam Moss
svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-1.23.threefour-merge-1a QAR-1592 Merge of changes between 1.23 RC2 and 1.23 Final to trunk
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-19DEV-31980: extract dispatch-by-string-name logic from LLAresListener to newNat Goodspeed
LLEventDispatcher and LLDispatchListener classes. See LLAresListener for example usage.
2009-06-18First pieces of event host module (DEV-31978).Brad Kittenbrink
Basically implements the spec nat decribed in the jira. Test coverage isn't yet complete though. mostly paired with nat.
2009-06-17DEV-32777: tip won't even build on Windows without pacifying MSVC warningNat Goodspeed
2009-06-11Merge with SVN trunkBryan O'Sullivan
2009-06-11Merge with SabinBryan O'Sullivan
2009-06-10Added LLAPRSockStream class and associated LLAPRSockStreambuf class forBrad Kittenbrink
DEV-31978 viewer event host socket module. reviewed by palmer+nat+mani.
2009-06-04Fix one more license, add indra/newview/tests to exported treeChristian Goetze
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().