b74af1c2aa
Merge with trunk
2009-06-25 11:19:31 -07:00
9c394b3aae
Ignore distcc state directory
2009-06-25 11:19:00 -07:00
7aec119d84
Merge with SVN login-api-3 branch
2009-06-25 11:12:51 -07:00
c5368c6368
Fix remaining Mac build errors
2009-06-25 09:49:24 -04:00
0bfef92889
Mercurial build: minor tweaks to fix some Mac build errors
2009-06-24 22:42:59 -04:00
fc9912070b
two more llstartup.cpp merge issues.
2009-06-24 18:19:23 -07:00
ba292920f0
Commiting merged llstartup.cpp, again?
2009-06-24 17:24:16 -07:00
a00af78b95
merge -r125267:125272 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/inventory-links__merge__viewer2.0.0-3-r125202 to svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3
2009-06-24 21:36:42 +00:00
70d99b2528
DEV-31980: remove cruft from lleventdispatcher.h
2009-06-24 16:25:33 +00:00
7e84d9125e
Fix Mac Build
2009-06-24 15:13:53 +00:00
da46eb9e7e
DEV-31980: Extend LLEventDispatcher to handle const as well as non-const
...
methods. Introduce LLAppViewerListener based on LLDispatchListener,
instantiate a static one in llappviewer.cpp. Initial implementation only
supports ["op"] == "requestQuit".
2009-06-24 01:54:57 +00:00
33c230b46d
A few more merge error fixes.
2009-06-23 18:29:59 -07:00
9b86d4c12f
Removed conflict markers (ie. <<<<<<<) in llmessage/CMakeLists.txt
...
Copied snprintf declaration in llstring from login-api-3
2009-06-23 17:58:51 -07:00
ad1ecb126b
QAR-1619 Fixing linux build error re: llui_libtest linkage
2009-06-24 00:54:30 +00:00
2ce76c7ed4
Set correct svn:eol-style native on XML files, converted several files to use consistent line feeds (had ^M after first header line). Not reviewed.
2009-06-23 23:32:39 +00:00
68da2bdfee
Merge build patch for Linux server builds from xui-army. I believe this fixes the "llui_libtest -lllui not found" build error.
...
Merging revisions 123378-123379 of svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/xui-army into G:\viewer-2-0-link\latest, respecting ancestry
2009-06-23 22:54:48 +00:00
85e326e7c7
Resolve merge
2009-06-23 18:24:41 -04:00
07a05e2c0a
Incomplete attempt to clean up Mercurial branch build
2009-06-23 18:16:57 -04:00
fe487f46e3
Fixed a bunch of missing includes and forward declares. I was trying to benchmark with precompiled headers off, but we'll have to do a bunch more cleanup before it's possible to disable that feature cleanly. Not reviewed.
2009-06-23 21:59:31 +00:00
91667335ce
QAR-1619: For some reason the LLWindowMesaHeadless constructor omitted the
...
LLWindowCallbacks* parameter passed by its consumer and required by the
base-class LLWindow constructor.
2009-06-23 21:31:09 +00:00
0ea53e0de4
QAR-1619: make assemblies/3rd_party_libs/linux64/boost.txt reference .a libs
...
that are actually present.
Update linux and linux64 boost tarballs with previous Windows, Mac patch.
2009-06-23 20:51:27 +00:00
d4330d3396
QAR-1619: fix Linux-only missing #include (Linux-only reference to LLTrans)
2009-06-23 20:20:01 +00:00
fae273975b
Fixed an "ADD_BUILD_TEST" leftover from the initial merge.
2009-06-23 11:29:55 -07:00
d01e9ccb75
Fix up some mismerged pieces of install.xml
2009-06-22 16:27:24 -07:00
5d7992d249
Switch to new unit test infrastructure
2009-06-22 16:05:57 -07:00
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
Bryan O'Sullivan