1454c32dc0
Merge with trunk
2009-06-22 15:39:14 -07:00
7306690dbd
Merge with SVN trunk
2009-06-22 15:38:58 -07:00
5f4c09fa1f
Python 2.4 and 2.6 improvements
...
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-22 22:36:36 +00:00
b012a60951
Merge with trunk
2009-06-22 15:10:15 -07:00
baa73fddd9
Merge with viewer-2.0.0-3 branch
2009-06-22 15:02:19 -07:00
85758bdfcf
Merge with SVN trunk
2009-06-22 12:57:53 -07:00
fcaa1ad46f
QAR-1383: convert new uses of Boost.Signals (arriving from other branches) to
...
Boost.Signals2 like the rest of the event-system-n code.
2009-06-22 12:52:18 +00:00
844ce9bf88
trivial comment fixes for typos that were bugging me...
2009-06-22 12:03:54 +00:00
401d51231f
Modified RecordToChatConsole to not construct LLFloaterChat if it doesn't already exist to avoid recursive floater construction.
2009-06-21 21:52:41 +00:00
33dbf11076
Fixed a shutdown crash.
2009-06-21 17:51:35 +00:00
ade6bbb06c
merge -r 124105-124625 skinning-13 -> viewer-2.0.0-3
2009-06-21 17:16:27 +00:00
9ec432034d
merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3
...
ignore-dead-branch
2009-06-21 08:04:56 +00:00
8ed056fde9
svn merge -r124872:124873
...
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-20 09:17:56 +00:00
351ebe9fcb
result of "svn merge -r123757:124890 svn+ssh://svn.lindenlab.com/svn/linden/branches/improve-unit-testing/iface-04" for QAR-1496
2009-06-19 23:24:11 +00:00
dc3833f31b
DEV-31980: extract dispatch-by-string-name logic from LLAresListener to new
...
LLEventDispatcher and LLDispatchListener classes. See LLAresListener for
example usage.
2009-06-19 00:17:30 +00:00
8a8edfd98c
First pieces of event host module (DEV-31978).
...
Basically implements the spec nat decribed in the jira.
Test coverage isn't yet complete though.
mostly paired with nat.
2009-06-18 23:42:51 +00:00
ad40d64b0e
DEV-32777: tip won't even build on Windows without pacifying MSVC warning
2009-06-17 15:13:48 +00:00
113f20d0a9
Merge with SVN trunk
2009-06-11 11:15:04 -07:00
02c86086ac
Merge with Sabin
2009-06-11 11:14:45 -07:00
050d2db0f8
Added LLAPRSockStream class and associated LLAPRSockStreambuf class for
...
DEV-31978 viewer event host socket module.
reviewed by palmer+nat+mani.
2009-06-10 00:00:03 +00:00
c90c3630ab
Fix one more license, add indra/newview/tests to exported tree
2009-06-04 21:18:04 +00:00
a845b78268
Fix licensing, also make the unzipping quieter, so that license error messages are easier to see in the log.
2009-06-04 20:43:12 +00:00
087bd26553
Merge of QAR-1383 event-system-7 into trunk.
...
svn merge -r 121797:121853 svn+ssh://svn.lindenlab.com/svn/linden/branches/merge-event-system-7
2009-06-04 16:24:21 +00:00
820d4a20d1
DEV-32777: Use a canonical boost::coroutines::coroutine signature, relying on
...
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-04 16:01:40 +00:00
a3d54c48c6
DEV-32777: When launching login coroutine, instead of binding _2, _3
...
placeholders and then asking Boost.Coroutine to pass parameters to them,
simply bind the desired values.
2009-06-04 02:37:59 +00:00
46291bf740
DEV-32777: Make coroutine's top-level function accept value params, not
...
reference params.
2009-06-04 01:59:31 +00:00
f9b9372027
Remove -parallelizeTargets from xcodebuild invocation, it seems to not work well enough
2009-06-03 23:18:22 +00:00
de55fd54bf
DEV-32777: update Boost.Coroutine for Windows too
2009-06-03 21:46:25 +00:00
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
9c94b76ec1
Merge with SVN trunk
2009-06-02 12:27:24 -07:00
af91e85531
Small braino
2009-06-02 17:25:54 +00:00
6eeb1bd48f
Merge with SVN trunk
2009-05-29 13:00:05 -07:00
7fe359b293
Added new LL_COMMON_API dll export declaration for new llsd_equals function.
2009-05-29 01:34:21 +00:00
7915162b96
DEV-31892: rev 119315 got lost somewhere along the way?! Reapplying.
2009-05-28 22:53:21 +00:00
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
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
657f8e45fa
Fix minor Mac build breakage (missing #include)
2009-05-27 21:16:21 +00:00
46e7bd31cd
Fix for mac build errors following r121524 commit for DEV-27646.
2009-05-27 17:41:57 +00:00
a81c084deb
Add llsd_equals(), a function whose absence sorely puzzles me
2009-05-26 22:36:38 +00:00
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
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
266e854e76
Merge with SVN trunk
2009-05-21 15:31:08 -07:00
93cf3d89e5
Put the os.environ["DISTCC"] = ... call into main()
2009-05-21 21:25:09 +00:00
77c1e2b761
Fix develop.py putenv bug, use new etch build-linux hosts for parabuild.
2009-05-21 20:59:56 +00:00
5748a14f5d
os.putenv doesn't do what we want, replaced with os.environ instead.
2009-05-21 13:54:35 -07:00
12508ac9b1
Merge with SVN trunk
2009-05-20 15:36:38 -07:00
fb309e781e
Windows: make dbghelp.dll an installable package
...
Reviewed by Mani.
2009-05-20 22:25:32 +00:00
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
d01f90c3b8
Merge with SVN trunk
2009-05-19 14:59:56 -07:00
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
Bryan O'Sullivan