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
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
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
f9b9372027
Remove -parallelizeTargets from xcodebuild invocation, it seems to not work well enough
2009-06-03 23:18:22 +00:00
af91e85531
Small braino
2009-06-02 17:25:54 +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
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
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
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
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
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
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
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
65c86eadcb
Max out distcc jobs to 12 in develop.py
2009-05-14 20:56:03 +00:00
32100098f5
There are 71 eniacs, not just 64
2009-05-14 20:26:00 +00:00
21a8d1f638
Make develop.py work on eniacs the same way it works on stations
2009-05-14 19:24:24 +00:00
0f4bd16294
Another line ending change
2009-05-11 21:42:09 +00:00
bafb150f24
Switch the XML file line endings to native.
2009-05-11 21:01:19 +00:00
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
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
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
9b2d9c6e6e
Retry. Build system fixes for library-library dependencies, ported from skinning-7. OK by CG.
...
svn merge -r117623:117624 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-7
2009-04-20 16:24:21 +00:00
5c2fd1e4fe
Back out last commit, because it breaks mapserver build on linux, dammit.
2009-04-17 22:00:04 +00:00
57b47705d7
Build system fixes for library-library dependencies, ported from skinning-7. OK by CG.
...
svn merge -r117623:117624 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-7
2009-04-17 20:39:07 +00:00
b01c75cb42
svn merge -r117314:117337
...
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/mv13a-merge-1
QAR-1343 maint-viewer-13a+libcurlexploitfix-3-3 combo merge
2009-04-16 23:45:35 +00:00
868250bdd7
Turn the artwork tree back into a downloaded package, but revision-control
...
the XML files.
2009-04-15 16:36:50 +00:00
9acd242b2e
Missed a file.
2009-04-14 20:10:56 +00:00
7966bd9b67
Re-add character data.
2009-04-14 20:04:08 +00:00
664f27380c
merge -r116796:116932 svn+ssh://svn.lindenlab.com/svn/linden/branches/http-texture/http-texture-10
...
DEV-8668 (llkdu) DEV-30348 (set development default channel to LindenDeveloper)
2009-04-13 21:03:44 +00:00
72c5076d6e
Working around DEV-30401 by yanking the etch 32bit build code until the viewer also builds on etch
2009-04-10 01:15:27 +00:00
c7c34d9ad2
Working around DEV-30401 by yanking the etch 32bit build code until the viewer also builds on etch
2009-04-10 01:14:30 +00:00
518afb3ac5
This is causing open source build problems - cherrypicked DEV-29644 VWR-12587: Cmake install target has a hard coded secondlife-bin reference remaining
2009-04-09 21:36:21 +00:00
1aca3ff6f5
Get 32-bit builds going on 64-bit Debian Etch.
...
Reviewed by Brad.
2009-04-09 18:05:56 +00:00
fa121d8ee1
svn merge -r115000:116937 svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.26
...
Merging from server-1.26 to trunk
Only a few conflicts:
scripts/farm_distribute : the upload rate in trunk was even more
conservative than the one I switched to in
1.26, so kept the trunk version.
indra/llcommon/llversionserver.h : did svn revert to keep trunk
indra/newsim/lltask.cpp : svn is weird. The merge conflict was one
that it's not obvious why it was there.
However, Simon and I looked at it, and the
solution was obvious : keep the trunk blob
where the conflict was flagged.
indra/lib/python : conflict was differing versions of the eventlib
extern. did svn revert . to keep trunk.
2009-04-09 00:20:15 +00:00
2768539bfe
svn merge -r116334:116916 svn+ssh://svn.lindenlab.com/svn/linden/branches/rad-chilies/rad-chilies-trunkmerge-2
2009-04-08 22:39:01 +00:00
4c3ffdfdda
We must #include <cstring> for memcmp to be found reliably.
2009-04-07 20:17:08 +00:00
3d4e04b556
QAR-1284 ip-takedown tools simulator work is ready for merge
...
svn merge -r115879:116020 svn+ssh://svn.lindenlab.com/svn/linden/branches/dmcat/dmcat-5
no conflicts
2009-04-01 17:11:37 +00:00
a8525c90b9
Move some viewer artwork into a downloadable package.
...
These files haven't been touched in years.
Reviewed by Richard.
2009-03-31 20:37:06 +00:00
8512298921
Removed a newline in string definition - cmake does not support multiline strings
2009-03-27 20:01:23 +00:00
a60c54568c
Result of svn merge -r115238:115240 svn+ssh://svn/svn/linden/branches/trivial-changes/trivial_slave_merge into trunk. In turn a result of svn merge -r113279:113280 svn+ssh://svn/svn/linden/branches/trivial-changes/trivial-changes-1 into trivial_slave_merge and svn merge -r107805:110030 svn+ssh://svn/svn/user/phoenix/slave-ds into trivial_slave_merge. QAR-1329
2009-03-27 19:40:03 +00:00
60afa5c864
Drop an unnecessary sed from linden.mass.
2009-03-27 18:53:37 +00:00
Nat Goodspeed