Oz Linden
|
76d67b1f78
|
adjust parameters for integration build
|
2011-02-17 18:46:04 -05:00 |
|
Oz Linden
|
7d16a19590
|
merge changes for viewer-autobuild
|
2011-02-17 13:52:53 -05:00 |
|
Oz Linden
|
b890f3cd55
|
merge lastest changes from viewer-vs2010
|
2011-02-17 13:51:50 -05:00 |
|
Andrew A. de Laix
|
e713da24e3
|
explicity call python scripts with python so they work on all platforms.
|
2011-02-17 09:50:08 -08:00 |
|
Oz Linden
|
fb94ad7646
|
try disabling parallel builds in TC for Linux
|
2011-02-17 12:39:01 -05:00 |
|
Oz Linden
|
cd885c0a09
|
Automated merge with ssh://bitbucket.org/jenn_linden/viewer-vs2010
|
2011-02-16 21:54:57 -05:00 |
|
Oz Linden
|
4497502d0d
|
Automated merge with file:///Users/oz/Work/viewer-autobuild
|
2011-02-16 21:53:52 -05:00 |
|
Oz Linden
|
893690bb4f
|
fix dos line endings
|
2011-02-16 20:58:49 -05:00 |
|
Alain Linden
|
008938e372
|
turn off parallel linux builds; they don't work for autobuild driven builds.
|
2011-02-16 16:39:33 -08:00 |
|
Alain Linden
|
faecf0fe9a
|
for now, turn off precompiled header usage by default (so Incredibuild will work).
|
2011-02-16 15:56:31 -08:00 |
|
Alain Linden
|
f83801ab59
|
temporarily turn off precompiled header usage to work around Incredibuild issues.
|
2011-02-16 15:46:34 -08:00 |
|
Oz Linden
|
75f7aca107
|
Automated merge with ssh://bitbucket.org/jenn_linden/viewer-vs2010
|
2011-02-16 18:24:03 -05:00 |
|
Oz Linden
|
bf7801aeec
|
merging in latest viewer-development
|
2011-02-16 18:18:34 -05:00 |
|
Alain Linden
|
8af932de1f
|
use new packages.
|
2011-02-16 14:06:50 -08:00 |
|
Alain Linden
|
a08deb9131
|
fix for INTEGRATION_TEST_llcapabilitylistener (include Python to run with correct python executable).
|
2011-02-16 13:13:13 -08:00 |
|
Oz Linden
|
eacd9d5d59
|
merge changes for storm-981
|
2011-02-16 15:52:05 -05:00 |
|
Alain Linden
|
c98996e684
|
fix test failure caused by dubious method for testing an empty string.
|
2011-02-15 12:03:45 -08:00 |
|
Andrew Meadows
|
c28fe65252
|
debug_console is now resizable
Reviewed with Callum Linden.
|
2011-02-14 14:15:12 -08:00 |
|
Oz Linden
|
3555849644
|
bump version number to 2.7.0
|
2011-02-14 16:58:46 -05:00 |
|
Oz Linden
|
068253b2fb
|
Added tag 2.6.0-start for changeset 92e58e51776a
|
2011-02-14 16:57:10 -05:00 |
|
Merov Linden
|
e15b543dd6
|
STORM-975 : pull into viewer-development
|
2011-02-11 17:42:37 -08:00 |
|
Merov Linden
|
58d8b666c2
|
STORM-833 : pull into viewer-development
|
2011-02-11 17:40:48 -08:00 |
|
Alain Linden
|
2f363a7707
|
explicitly import ZLIB.
|
2011-02-11 16:00:16 -08:00 |
|
Alain Linden
|
18a49e58ea
|
update curl and dependent installed archies to vs2010 builds.
|
2011-02-11 15:18:11 -08:00 |
|
Oz Linden
|
4d040e3c5d
|
merge local changes
|
2011-02-11 14:06:27 -05:00 |
|
Oz Linden
|
924be3f25c
|
pull back release tag from viewer-beta
|
2011-02-11 11:38:27 -05:00 |
|
Dessie Linden
|
40abc0fe1e
|
Added tag 2.5.0-release, DRTVWR-31_2.5.0-release for changeset b723921b5c71
|
2011-02-11 08:08:00 -08:00 |
|
Alain Linden
|
38a2af9235
|
various fixes to get the debug build working; don't look for or copy msvc*80.dll's.
|
2011-02-10 17:26:16 -08:00 |
|
Merov Linden
|
547b40bfc8
|
STORM-986 : Fix for Linux build
|
2011-02-10 11:56:06 -08:00 |
|
callum
|
6a5d194526
|
STORM-986 FIX (build error/Linux) media_plugin_webkit errors on some Windows systems
|
2011-02-10 11:51:53 -08:00 |
|
Oz Linden
|
9251d95205
|
OPEN-1: (partial) use environment when building with Visual Studio Express
|
2011-02-10 14:41:00 -05:00 |
|
Oz Linden
|
9bdaf04432
|
OPEN-1: (partial) use environment when building with Visual Studio Express
|
2011-02-10 14:41:00 -05:00 |
|
Merov Linden
|
9aaf4b3ba7
|
STORM-981 : Fix Linux link issues when LL_TESTS is ON
|
2011-02-09 22:08:43 -08:00 |
|
Merov Linden
|
76cb9a7796
|
STORM-986 : pull into viewer-development
|
2011-02-09 20:18:26 -08:00 |
|
Merov Linden
|
b82f2c4e4d
|
pull from viewer-development
|
2011-02-09 15:10:26 -08:00 |
|
Seth ProductEngine
|
65e88ce61d
|
STORM-833 FIXED "i" button overlapping text in name list controls like Group Members list.
|
2011-02-10 00:34:54 +02:00 |
|
Xiaohong Bao
|
b6571ee127
|
Automated merge with http://hg.secondlife.com/viewer-development
|
2011-02-09 12:16:00 -07:00 |
|
Xiaohong Bao
|
8d43cb2701
|
trivial: remove some redundant code.
|
2011-02-09 12:15:21 -07:00 |
|
callum
|
0ea1b472c6
|
Additional fix for llmediaplugintest compilation failure after fix for VWR-21275
|
2011-02-09 10:12:20 -08:00 |
|
Xiaohong Bao
|
54cced2356
|
debug code for SH-924: [PUBLIC-JIRA-USERS] Viewer crash in LLSurface::getWaterHeight
|
2011-02-09 10:33:07 -07:00 |
|
Merov Linden
|
e58cbfa53e
|
STORM-601 : pull into viewer-development
|
2011-02-08 22:26:03 -08:00 |
|
Merov Linden
|
300c79e7af
|
STORM-433 : pull into viewer-development
|
2011-02-08 22:25:10 -08:00 |
|
Merov Linden
|
1c47a23d6b
|
STORM-507 : pull into viewer-development
|
2011-02-08 22:24:26 -08:00 |
|
Merov Linden
|
47642e96f9
|
STORM-953 : pull into viewer-development
|
2011-02-08 22:23:32 -08:00 |
|
Merov Linden
|
6ba900073f
|
STORM-955 : pull into viewer-development
|
2011-02-08 22:22:25 -08:00 |
|
Merov Linden
|
2a13dc7930
|
STORM-960 : pull into viewer-development
|
2011-02-08 22:21:15 -08:00 |
|
callum
|
7e6ce12a17
|
VWR-21275 FIX // *SOME* Windows systems fail to load the Qt plugins if the current working
Reviewed by Richard - http://codereview.lindenlab.com/6011001/
|
2011-02-08 15:37:12 -08:00 |
|
Alain Linden
|
6dd41886b3
|
fix a couple more packaging problems...
|
2011-02-08 12:14:17 -08:00 |
|
Alain Linden
|
c2bfa25299
|
update pacageing of msvc?100.dll's; use latest qt package with all needed libs.
|
2011-02-07 16:46:18 -08:00 |
|
Alain Linden
|
ceeffc6c92
|
use up to date openssl package.
|
2011-02-07 12:56:58 -08:00 |