Richard Linden
|
78d76eb4b0
|
Automated merge with bundle:E:\code\viewer-experience+c:\users\richard\appdata\local\temp\thg.t3awyz\ssh__richard@hg.lindenlab.com_richard_viewer-experience-merge_2xcevh.hg
|
2011-05-02 17:29:56 -07:00 |
|
Oz Linden
|
b9c7d38370
|
merge changes for beta fixes
|
2011-04-22 11:52:02 -04:00 |
|
Oz Linden
|
06c4819b09
|
merge avatar physics fixes
|
2011-04-21 21:47:09 -04:00 |
|
Richard Linden
|
a9aeeab6c5
|
removed skylight-specific build params
|
2011-04-21 18:36:07 -07:00 |
|
Oz Linden
|
49ecf8efbc
|
merge back fixes for STORM-1088 and (possibly) STORM-1141
|
2011-04-21 14:30:58 -04:00 |
|
Seraph Linden
|
a50dab44d0
|
automated merge viewer-pre-release -> seraph-viewer-beta
|
2011-04-20 22:30:29 -04:00 |
|
Oz Linden
|
252cb50c38
|
merge changes for storm-1088
|
2011-04-20 20:21:55 -04:00 |
|
Debi King (Dessie)
|
da7cd9f811
|
merged from 2.6.4-start tag in viewer-development
|
2011-04-18 10:07:40 -04:00 |
|
Oz Linden
|
796a94fc6e
|
correct build parameters for Oz viewer beta review build
|
2011-04-17 09:07:01 -04:00 |
|
Debi King (Dessie)
|
a1340acb3c
|
Updated release-viewer.jira to DRTVWR-46 for v2.6.3 Release
|
2011-04-14 16:56:50 -04:00 |
|
Debi King (Dessie)
|
e119b26f03
|
merged tip of viewer-beta at changeset 9de6fc07304f
|
2011-04-14 16:54:02 -04:00 |
|
Oz Linden
|
07a122c43c
|
adjust build parameters for Oz projects
|
2011-04-08 21:29:52 -04:00 |
|
Oz Linden
|
5dea0bb37c
|
merge changes for viewer-social-2
|
2011-04-08 17:36:13 -04:00 |
|
Oz Linden
|
ed32a5e2b8
|
pull tags and late fixes back from viewer-pre-release
|
2011-04-08 09:24:58 -04:00 |
|
Oz Linden
|
444311d580
|
pull tags and late fixes back from viewer-pre-release
|
2011-04-08 09:24:07 -04:00 |
|
Debi King (Dessie)
|
746633c6ad
|
Merged BuildParams
|
2011-04-07 22:35:27 -04:00 |
|
Debi King (Dessie)
|
a22e3df7e5
|
Set release-viewer.jira to DRTVWR-44 for v2.6.2
|
2011-04-07 22:03:24 -04:00 |
|
Richard Linden
|
1d34e7b90b
|
Automated merge with http://hg.secondlife.com/viewer-development
|
2011-04-06 15:20:51 -07:00 |
|
Oz Linden
|
94aa24a89e
|
merge changes for social-859
|
2011-04-04 15:26:56 -04:00 |
|
Oz Linden
|
6e84133c98
|
merge changes for social-859
|
2011-04-04 15:32:00 -04:00 |
|
Richard Linden
|
80efbeead1
|
merge
|
2011-04-01 18:23:13 -07:00 |
|
Oz Linden
|
635a4524fa
|
pull tags from viewer-development
|
2011-03-31 15:50:34 -04:00 |
|
Dessie Linden
|
256ed564ac
|
Set release-viewer.jira to DRTVWR-42
|
2011-03-31 12:40:30 -07:00 |
|
Dessie Linden
|
5c3ae68299
|
merged .hgtags from viewer-release
|
2011-03-30 17:46:51 -07:00 |
|
Richard Linden
|
84b179b0bf
|
Automated merge with file:///F:\code\viewer-autobuild2010
|
2011-03-28 17:38:54 -07:00 |
|
Dessie Linden
|
b597bc02d7
|
Set release-viewer.jira value to DRTVWR-39
|
2011-03-24 12:51:25 -07:00 |
|
Oz Linden
|
9d2f08427b
|
pull updates to the start of 2.6.2 from viewer-development
|
2011-03-21 09:31:49 -04:00 |
|
Oz Linden
|
df63c6931e
|
update build parameters for Oz builds
|
2011-03-21 08:48:04 -04:00 |
|
Oz Linden
|
5a1b27ba5f
|
merge out latest viewer-development
|
2011-03-19 06:32:13 -04:00 |
|
Oz Linden
|
1a7369408c
|
set build parameters for open dev projects
|
2011-03-18 20:59:10 -04:00 |
|
Oz Linden
|
6991eafce8
|
disable parallel linking in autobuild2010
|
2011-03-18 19:44:54 -04:00 |
|
Oz Linden
|
c54d5353a6
|
add build name parameters
|
2011-03-18 12:46:16 -04:00 |
|
Oz Linden
|
cd48598333
|
configure oz_viewer-autobuild2010 for separate debug builds on windows
|
2011-03-18 08:25:29 -04:00 |
|
Oz Linden
|
7e3c32308c
|
merge out 2.6.0 changes from viewer-development
|
2011-03-18 08:08:12 -04:00 |
|
Merov Linden
|
741de388d3
|
Autobuild: pull in from jenn_linden/viewer-vs2010
|
2011-03-17 11:24:22 -07:00 |
|
brad kittenbrink
|
1ce22e11fd
|
Removed trailing spaces that were breaking BuildParams parsing.
|
2011-03-17 12:49:30 -04:00 |
|
Oz Linden
|
d27a695b0b
|
remove unused configurations, modify my review build configuration
|
2011-03-17 12:25:28 -04:00 |
|
brad kittenbrink
|
4d11d30a3e
|
Updated BuildParams in prep for vs2010 project viewer.
|
2011-03-16 19:29:14 -04:00 |
|
Dessie Linden
|
abffd7aa4f
|
Added viewer-pre-beta parameters to BuildParams
|
2011-03-15 13:25:38 -07:00 |
|
Oz Linden
|
df633558e4
|
add parameters for pre-release repo
|
2011-03-10 16:42:07 -05:00 |
|
Alain Linden
|
ba1d1267fe
|
Automated merge with https://bitbucket.org/jenn_linden/viewer-vs2010
|
2011-03-03 13:56:43 -08:00 |
|
Alain Linden
|
8dffedb246
|
merge from lindenlab/viewer-development
|
2011-03-03 10:38:39 -08:00 |
|
Oz Linden
|
856a6992eb
|
pull latest changes from viewer-vs2010
|
2011-03-03 07:50:40 -05:00 |
|
Jennifer Leech
|
0d93ce2e4a
|
RelWithDebInfo build succeeded on TeamCity! Re-enabling Degug and Release builds.
|
2011-03-02 16:42:03 -08:00 |
|
Jennifer Leech
|
c3efc900c6
|
Make temporary disabling of Debug/Release builds broadened to all builds regardless of name.
Need to increase iteration speed. Will revert when finished.
|
2011-03-02 14:40:31 -08:00 |
|
Jennifer Leech
|
6a10c803d3
|
Setting TMP env var to be used during builds. Possible collision when using VS2010 with system-wide TMP directory.
Also temporarily disabling Debug and Release builds to get a faster loop cyle on TC.
|
2011-03-01 14:26:24 -08:00 |
|
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
|
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 |