Commit Graph

179 Commits (fc3eaffc0de59a5fa8e74442c51d2aab6adac310)

Author SHA1 Message Date
Brad Payne (Vir Linden) ca5bd96bb0 merge 2011-07-21 16:26:52 -04:00
Christian Goetze (CG) 299615e9d6 Re-enable public build status indicators 2011-07-20 11:48:19 -07:00
Brad Payne (Vir Linden) 0ddf718d92 still trying to fix channels 2011-07-20 13:48:46 -04:00
Brad Payne (Vir Linden) 7d8ec74213 Switching channels to project viewer 2011-07-20 11:30:55 -04:00
simon@lindenlab.com 1cf5ce3a43 Merge latest from viewer trunk 2011-07-07 17:46:18 -07:00
simon@lindenlab.com d40bd76ec7 Merge viewer 2.7.6 from trunk 2011-06-27 10:15:24 -07:00
Oz Linden 5d36b70aa6 merge changes for latest viewer-development 2011-06-26 07:32:22 -04:00
Oz Linden 13de92740e merge latest viewer-development 2011-06-22 11:45:43 -04:00
Oz Linden f657e8e16f remove error from build logs by taking out obsolete param (cg said this was ok to do) 2011-06-22 11:37:46 -04:00
Oz Linden c8232b6595 update codeticket configuration for my review builds 2011-06-22 11:36:52 -04:00
Oz Linden a5474e3398 remove a bunch of builds that are no longer needed 2011-06-22 11:30:18 -04:00
simon@lindenlab.com d11cabc489 Merge with latest lindenlab/viewer-development 2011-06-21 09:36:31 -07:00
Debi King (Dessie) fcf2ed5901 merged .hgtags & BuildParams 2011-06-21 11:47:58 -04:00
simon@lindenlab.com 9a02a4a1ea Merge with latest lindenlab/viewer-development 2011-06-16 13:15:30 -07:00
Brad Payne (Vir Linden) cc97e3d5ca merge 2011-06-14 10:14:44 -04:00
Debi King (Dessie) f766d2fac1 reconciled .hgtags 2011-06-13 14:18:54 -04:00
Oz Linden e35cc6f42b suppress codeticket tracking for ephemeral review repo 2011-06-13 08:25:01 -04:00
Dave SIMmONs 484a4733b7 Merge latest from lindenlab/viewer-development/ 2011-06-08 14:53:00 -07:00
Dave Parks f1784209d5 merge 2011-06-07 14:42:54 -05:00
Don Kjer 357062a196 Added build params for mesh-asset-deprecation 2011-06-03 19:46:34 +00:00
Oz Linden 8bfd3201de merge changes for latest viewer-development 2011-06-01 22:07:12 -04:00
Oz Linden 6bc63bddee merge changes for new search 2011-05-31 22:29:28 -04:00
Dave SIMmONs 3dfb4944ed Merge latest from lindenlab/viewer-development 2011-05-24 10:51:09 -07:00
Oz Linden 551d17f819 merge latest changes (post-2.7.0) from viewer-development 2011-05-23 11:38:33 -04:00
Oz Linden e8532721c3 correct channel names to include "Second Life" 2011-05-17 06:50:58 -04:00
Oz Linden 716bd22fbc Insert parameters for Search project viewer (replacing old Display Name viewer) 2011-05-16 15:46:43 -04:00
Dave Parks 93696ac019 merge 2011-05-12 17:39:08 -05:00
Dave SIMmONs 00c5628074 Merge lindenlab/viewer-development 2011-05-12 13:42:51 -07:00
Oz Linden 353d2059fc merge up to latest viewer-development 2011-05-11 13:47:12 -04:00
Oz Linden 7610c0c050 change project viewer name from estate to region 2011-05-11 13:45:43 -04:00
Dave SIMmONs 11f988cd09 Change BuildParams to set public_build = false for this branch 2011-05-09 16:33:42 -07:00
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
Dave Parks a25f898703 merge 2011-05-02 14:52:12 -05:00
Oz Linden c3df5f5d67 merge up latest viewer-development 2011-04-22 18:25:57 -04:00
Dave Parks 764412f9b5 merge 2011-04-22 11:50:19 -05: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
Dave Parks 62208046ae merge 2011-04-21 16:37:03 -05:00
Dave Parks 19857d0cf0 merge 2011-04-21 16:23:00 -05: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 eb15f9a8ce merge latest changes from windlight integration repo 2011-04-20 20:46:46 -04:00
Oz Linden 252cb50c38 merge changes for storm-1088 2011-04-20 20:21:55 -04:00
Dave Parks 5cf5e4bb88 merge 2011-04-19 16:35:37 -05:00
Oz Linden 302e0bc87e move windlight project build to a new TeamCity build 2011-04-19 16:35:06 -04:00
Dave Parks 3b5d6eed12 merge 2011-04-19 14:55:11 -05: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