Commit Graph

1812 Commits (1d4d4fec00aacb1e1e00a4f60a6af4d8ed3b8bde)

Author SHA1 Message Date
Nat Goodspeed 46291bf740 DEV-32777: Make coroutine's top-level function accept value params, not
reference params.
2009-06-04 01:59:31 +00:00
Christian Goetze f9b9372027 Remove -parallelizeTargets from xcodebuild invocation, it seems to not work well enough 2009-06-03 23:18:22 +00:00
Nat Goodspeed de55fd54bf DEV-32777: update Boost.Coroutine for Windows too 2009-06-03 21:46:25 +00:00
Nat Goodspeed 285613b892 DEV-32777: Introduce LLCoros, an LLSingleton registry of named coroutine
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-03 21:38:21 +00:00
Bryan O'Sullivan 9c94b76ec1 Merge with SVN trunk 2009-06-02 12:27:24 -07:00
Bryan O'Sullivan af91e85531 Small braino 2009-06-02 17:25:54 +00:00
Bryan O'Sullivan 6eeb1bd48f Merge with SVN trunk 2009-05-29 13:00:05 -07:00
Brad Kittenbrink 7fe359b293 Added new LL_COMMON_API dll export declaration for new llsd_equals function. 2009-05-29 01:34:21 +00:00
Nat Goodspeed 7915162b96 DEV-31892: rev 119315 got lost somewhere along the way?! Reapplying. 2009-05-28 22:53:21 +00:00
Nat Goodspeed c607752a9d DEV-32777: ensure that stack objects listening on persistent LLEventPumps get
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-28 21:25:58 +00:00
Nat Goodspeed f910157c16 DEV-31979: Introduce LLReqID, a class to help individual event API listeners
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-27 21:17:22 +00:00
Nat Goodspeed 657f8e45fa Fix minor Mac build breakage (missing #include) 2009-05-27 21:16:21 +00:00
Brad Kittenbrink 46e7bd31cd Fix for mac build errors following r121524 commit for DEV-27646. 2009-05-27 17:41:57 +00:00
Nat Goodspeed a81c084deb Add llsd_equals(), a function whose absence sorely puzzles me 2009-05-26 22:36:38 +00:00
Brad Kittenbrink 01d390825a DEV-27646 dll linkage for login module.
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-22 23:27:16 +00:00
Adam Moss 9dfe0ca9a0 svn merge -r121194:121210
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-22 09:58:47 +00:00
Bryan O'Sullivan 266e854e76 Merge with SVN trunk 2009-05-21 15:31:08 -07:00
Christian Goetze 93cf3d89e5 Put the os.environ["DISTCC"] = ... call into main() 2009-05-21 21:25:09 +00:00
Christian Goetze 77c1e2b761 Fix develop.py putenv bug, use new etch build-linux hosts for parabuild. 2009-05-21 20:59:56 +00:00
David Kaprielian 5748a14f5d os.putenv doesn't do what we want, replaced with os.environ instead. 2009-05-21 13:54:35 -07:00
Bryan O'Sullivan 12508ac9b1 Merge with SVN trunk 2009-05-20 15:36:38 -07:00
Bryan O'Sullivan fb309e781e Windows: make dbghelp.dll an installable package
Reviewed by Mani.
2009-05-20 22:25:32 +00:00
Mark Palange 8c5ca38f1d Fix to develop.py to build on 64 bit windows.
Added March 2009 DirectX SDK to cmake config.
Reviewed by brad
2009-05-19 23:41:59 +00:00
Bryan O'Sullivan d01f90c3b8 Merge with SVN trunk 2009-05-19 14:59:56 -07:00
Robert Knop d43bd2cfdd Now that 1.27 has branched away, bumping the version number to 1.29 to
mean "the development version between release versions 1.27 and 1.30".
2009-05-19 21:18:49 +00:00
Robert Knop 9a8d069902 svn merge -r118673:120720 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-19 17:16:44 +00:00
Robert Knop 99660542bb Adding back the setting of "DEBUG", the lack of which caused many unit
tests to fail.
2009-05-19 15:19:39 +00:00
Aaron Brashears 6df2755ba6 Result of svn merge -r119432:120464 svn+ssh://svn/svn/linden/branches/http_database/merge-03 into trunk. QAR-1462 2009-05-18 23:38:35 +00:00
Christian Goetze 0257214763 Set DISTCC_DIR to a location inside the source tree to avoid causing NFS trouble with the default setting. 2009-05-14 21:20:37 +00:00
Christian Goetze 65c86eadcb Max out distcc jobs to 12 in develop.py 2009-05-14 20:56:03 +00:00
Nat Goodspeed cb5918df31 Remove silly std::cout debugging output 2009-05-14 20:50:50 +00:00
Christian Goetze 32100098f5 There are 71 eniacs, not just 64 2009-05-14 20:26:00 +00:00
Christian Goetze 21a8d1f638 Make develop.py work on eniacs the same way it works on stations 2009-05-14 19:24:24 +00:00
Nat Goodspeed 3975de991d svn merge -r113003:119136 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-13 23:35:42 +00:00
Nat Goodspeed a087bbeda3 Any static instance of an STL container introduces static-initializer-order
bugs. Use internal, informal singleton pattern to work around that.
2009-05-13 23:31:47 +00:00
Bryan O'Sullivan 0f4bd16294 Another line ending change 2009-05-11 21:42:09 +00:00
Bryan O'Sullivan 596c52cdf8 Merge with SVN trunk 2009-05-11 14:22:18 -07:00
Bryan O'Sullivan bafb150f24 Switch the XML file line endings to native. 2009-05-11 21:01:19 +00:00
Nat Goodspeed dc93462991 svn merge -r113003:119136 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-11 20:05:46 +00:00
Nat Goodspeed 3800c0df91 svn merge -r114679:114681 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-08 21:08:08 +00:00
Steven Bennetts 5da967dc74 merge skinning-7 -r 119501-119577 -> viewer-2.0.0-1 *NOTE: This overlaps a little with the skinning-7 -> skinning-8 merge of 119500-119692 -- James
ignore-dead-branch
2009-05-08 07:58:49 +00:00
Steven Bennetts 65d90e0e8b Replaced combo_item with combo_box.item and converted contents labels into label attributes for all translations. 2009-05-08 07:49:43 +00:00
Steven Bennetts a4000c3744 merge trunk@116587 skinning-7@119389 -> viewer-2.0.0-skinning-7 2009-05-08 07:43:08 +00:00
Steven Bennetts 6c4cadbb04 Update version to 2.0.0.0 !!! 2009-05-08 01:26:20 +00:00
Bryan O'Sullivan 17d940c152 Merge with SVN trunk 2009-05-06 17:00:59 -07:00
Adam Moss cc92525b0d QAR-1476 Combo-merge to trunk: Viewer 1.23 RC0 and Simulator 1.26.3
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
2009-05-04 17:43:26 +00:00
Christian Goetze 4bcbf33422 svn merge -r118008:118374 svn+ssh://svn.lindenlab.com/svn/linden/branches/cg/viewer-etch-1
QAR-1459 etch builds enabled
2009-04-30 06:52:38 +00:00
Bryan O'Sullivan 324c135273 Merge with SVN trunk 2009-04-28 13:29:04 -07:00
Kelly Washington d5aad9ebc3 svn merge -r117696:117697 svn+ssh://svn.lindenlab.com/svn/linden/branches/fix-lslrpc/fix-lslrpc-merge to svn+ssh://svn.lindenlab.com/svn/linden/trunk 2009-04-21 20:08:05 +00:00
Bryan O'Sullivan e0207fc076 Merge with SVN trunk 2009-04-21 10:34:23 -07:00