Richard Linden
|
2270647009
|
added params for project interesting
|
2013-10-15 15:19:35 -07:00 |
|
simon
|
27d637d0f1
|
Merge downstream code from CHUIStorm release
|
2013-08-26 14:43:23 -07:00 |
|
Oz Linden
|
82bf4e4db2
|
merge changes for DRTVWR-285
|
2013-08-19 15:15:15 -04:00 |
|
JJ Linden
|
10c8fbbedb
|
added default sourceid and check that sourceid is not blank, hoping to get the windows builds to recognize the value
|
2013-07-24 14:38:23 -07:00 |
|
Dave Parks
|
79029149a4
|
Automated merge with file:///F:%5Cviewer-bear
|
2013-06-21 12:51:29 -05:00 |
|
Merov Linden
|
b3c010ea71
|
Pull merge lindenlab/viewer-release
|
2013-06-19 12:24:44 -07:00 |
|
Merov Linden
|
d65f09ebca
|
DRTVWR-324 : Suppress the use of BuildParams to set up the channel and use the TC environment settings instead
|
2013-06-18 13:33:51 -07:00 |
|
Oz Linden
|
4d62a56ff9
|
advance project to Beta phase... !!!
|
2013-05-17 16:27:17 -04:00 |
|
JJ Linden
|
89e1e01084
|
updated BuildParams to try to fix windows build issue
|
2013-05-15 22:28:51 -07:00 |
|
JJ Linden
|
a606a1cd68
|
merged in branch for changing BuildParams
|
2013-05-15 14:57:56 -07:00 |
|
JJ Linden
|
435bda9df4
|
turned off distcc for linux builds
|
2013-05-15 13:29:19 -07:00 |
|
Graham Madarasz
|
e1c1428569
|
Merge viewer-dev-materials and bugfix in LLPanelFace::getState using material instead of mMaterial
|
2013-05-11 20:38:23 -07:00 |
|
Oz Linden
|
4d22c32aa9
|
merge changes for 3.5.2-beta4
|
2013-05-10 10:56:40 -04:00 |
|
Oz Linden
|
1b984d8f40
|
merge changes for 3.5.1-release
|
2013-05-08 14:46:00 -04:00 |
|
Oz Linden
|
2bcc75470d
|
Override default channel from buildscripts project
|
2013-04-30 14:19:34 -04:00 |
|
Graham Madarasz
|
fd447189c5
|
Merge 3.5.1 into Materials
|
2013-04-25 21:00:16 -07:00 |
|
Oz Linden
|
3bb708d706
|
merge up to latest viewer-development for merge to 3.5.2
|
2013-04-19 14:42:56 -04:00 |
|
Oz Linden
|
ddd5659f81
|
merge changes for DRTVWR-294
|
2013-04-19 10:11:29 -04:00 |
|
Oz Linden
|
327c99cadb
|
merge up to 3.5.2 development
|
2013-04-16 16:01:32 -04:00 |
|
Oz Linden
|
2fde4a9ae5
|
merge changes for 3.5.0-beta7
|
2013-04-01 14:24:01 -04:00 |
|
Graham Madarasz
|
bf6182daa8
|
Update Mac and Windows breakpad builds to latest
|
2013-03-29 07:50:08 -07:00 |
|
prep
|
207d9fd767
|
Viewer-chui merge
|
2013-03-11 14:45:53 -04:00 |
|
Oz Linden
|
89816222d2
|
change channel name to new convention
|
2013-03-01 12:56:20 -05:00 |
|
Oz Linden
|
8397f62059
|
force new codeticket number
|
2013-02-27 13:19:50 -05:00 |
|
Oz Linden
|
b7cd89da5f
|
change to force new codeticket number
|
2013-02-12 16:43:16 -05:00 |
|
Merov Linden
|
573ab07a40
|
Merge pull from lindenlab/viewer-beta
|
2013-01-10 14:51:59 -08:00 |
|
Oz Linden
|
0b1d70fd71
|
whitespace change to force new codeticket
|
2013-01-03 16:36:39 -05:00 |
|
William Todd Stinson
|
74d3dc41fb
|
Pull and merge from https://bitbucket.org/lindenlab/viewer-development.
|
2012-12-11 17:04:23 -08:00 |
|
Logan Dethrow
|
0302573348
|
Automated merge with ssh://bitbucket.org/lindenlab/viewer-development
|
2012-12-11 16:38:10 -05:00 |
|
Logan Dethrow
|
b6a7c8fcfd
|
Merge in backed out changes.
|
2012-12-07 17:50:37 -05:00 |
|
Logan Dethrow
|
954200e97f
|
Backed out changeset 69636bceb5a2.
|
2012-12-07 17:48:50 -05:00 |
|
Logan Dethrow
|
77f58a7524
|
Backed out changeset 227671259809.
|
2012-12-07 17:48:10 -05:00 |
|
Logan Dethrow
|
8aa32015a9
|
Backed out changeset 5cf865a7afa7
|
2012-12-07 17:47:03 -05:00 |
|
prep
|
e0432f98ee
|
SH-3563. Pull and merge from viewer-development. Modest code changes to fix alignment issue in llAppearance.
|
2012-11-28 16:36:34 -05:00 |
|
William Todd Stinson
|
0011fb5e69
|
Pull and merge from https://bitbucket.org/lindenlab/viewer-development.
|
2012-11-27 17:28:49 -08:00 |
|
William Todd Stinson
|
c9044c03b3
|
Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta.
|
2012-11-09 18:51:23 -08:00 |
|
William Todd Stinson
|
a4945f36de
|
Pull and merge from https://bitbucket.org/lindenlab/viewer-development.
|
2012-11-06 12:30:32 -08:00 |
|
William Todd Stinson
|
b1035e2713
|
Pull and merge from https://bitbucket.org/lindenlab/viewer-development.
|
2012-11-06 12:28:41 -08:00 |
|
William Todd Stinson
|
3b39ec165a
|
Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta.
|
2012-11-02 17:56:35 -07:00 |
|
Oz Linden
|
02afdef369
|
merge back fixes from 3.4.1-beta12
|
2012-11-02 16:48:56 -04:00 |
|
Oz Linden
|
dd55b600e5
|
whitespace change to force new build number
|
2012-11-02 14:58:09 -04:00 |
|
William Todd Stinson
|
333c53db92
|
Pull and merge from https://bitbucket.org/lindenlab/viewer-development.
|
2012-11-01 10:49:50 -07:00 |
|
Oz Linden
|
a7f02a3e51
|
merge changes for 3.5.0-beta2
|
2013-03-08 10:10:59 -05:00 |
|
Oz Linden
|
510c476468
|
clarify how to set viewer_channel for different build types
|
2013-02-20 15:52:37 -05:00 |
|
Oz Linden
|
5ea68c69a4
|
convert to new channel name scheme and remove login_channel build time parameter
|
2013-02-12 10:50:47 -05:00 |
|
William Todd Stinson
|
be0406bffd
|
Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta.
|
2012-10-31 10:52:54 -07:00 |
|
Oz Linden
|
1a872c7bf8
|
pull back changes from 3.4.1-beta11
|
2012-10-30 14:34:05 -04:00 |
|
callum_linden
|
682d7355fd
|
whitespace change to force new build in TC
|
2012-10-22 15:51:07 -07:00 |
|
callum_linden
|
e18d97782f
|
Turn off configs and tests for testingg
|
2012-10-19 16:45:40 -07:00 |
|
callum_linden
|
15cde616b9
|
Update to BuildParams var
|
2012-10-19 16:14:11 -07:00 |