Ignored revisions: 12346
included in: 225638
changeset: 15591:9653366fcfa7
tag: tip
parent: 15590:80e11ace13b1
parent: 15589:7f37add8f86e
user: Oz Linden
date: Fri Apr 01 17:39:08 2011 -0400
summary: merge out end-of-develop.py tag from viewer-development
codeticket: 225606
included in: 225638
changeset: 15589:7f37add8f86e
parent: 15585:77a129016db5
parent: 15588:137be47ae991
user: Oz Linden
date: Fri Apr 01 14:18:24 2011 -0400
summary: pull latest changes from viewer-autobuild2010
codeticket: 225636
codeticket: 225600
included in: 225606
changeset: 15588:137be47ae991
user: Oz Linden
date: Fri Apr 01 13:31:08 2011 -0400
summary: correct merge error in prehash change
codeticket: 225595
included in: 225636
included in: 225600
changeset: 15587:f2b7f19d02f3
parent: 15586:bb20ba796460
parent: 15584:1345ce23e5a3
user: Oz Linden
date: Fri Apr 01 12:47:19 2011 -0400
summary: merge changes for storm-1130
codeticket: 225594
included in: 225595
changeset: 15584:1345ce23e5a3
user: Oz Linden
date: Fri Apr 01 12:08:03 2011 -0400
summary: update message template hash to correct value
included in: 225594
changeset: 15583:18d124ed6979
parent: 15178:52b2263ab28f
parent: 15582:e8e46331b0f0
user: Oz Linden
date: Fri Apr 01 09:52:37 2011 -0400
summary: pull latest changes from viewer-development
codeticket: 225588
codeticket: 225587
included in: 225594
changeset: 15582:e8e46331b0f0
parent: 15177:8357a9042310
parent: 15581:1295c18aea14
user: Oz Linden
date: Fri Apr 01 09:24:05 2011 -0400
summary: merge changes for storm-1072
included in: 225588
included in: 225587
changeset: 15581:1295c18aea14
parent: 15175:1f0de238a517
parent: 15580:6a147e973c1a
user: Oz Linden
date: Fri Apr 01 09:23:27 2011 -0400
summary: merge changes for storm-399
included in: 225588
included in: 225587
changeset: 15580:6a147e973c1a
parent: 15163:d30636c2a83a
parent: 15568:070d5edfd0c9
user: Oz Linden
date: Thu Mar 31 15:50:34 2011 -0400
summary: pull tags from viewer-development
codeticket: 225608
codeticket: 225584
codeticket: 225493
codeticket: 225488
codeticket: 225469
included in: 225588
included in: 225587
changeset: 15568:070d5edfd0c9
parent: 15567:a441951412e4
parent: 15556:f8280eb575e7
user: Oz Linden
date: Thu Mar 31 13:03:05 2011 -0400
summary: merge out alains fix for qtwebkit reversion
codeticket: 225461
codeticket: 225460
included in: 225608
included in: 225584
included in: 225493
included in: 225488
included in: 225469
changeset: 15556:f8280eb575e7
user: Andrew de Laix
date: Thu Mar 31 16:17:12 2011 +0000
summary: d'oh, forgot to add back some q libs to the build when reverting to older linux package; here they are.
codeticket: 225455
codeticket: 225407
codeticket: 225356
codeticket: 225355
included in: 225461
included in: 225460
changeset: 15555:3ad180cd2e6b
user: Andrew de Laix
date: Wed Mar 30 20:12:37 2011 +0000
summary: remove lib requirement not in current llqtwebkit linux archive.
codeticket: 225344
codeticket: 225343
included in: 225455
included in: 225407
included in: 225356
included in: 225355
changeset: 15554:7610ee5a69f2
parent: 15553:284e995627ed
parent: 15552:dcc9b83b29bf
user: alain@945battery-guestA-183.lindenlab.com
date: Wed Mar 30 11:47:03 2011 -0700
summary: Merge
codeticket: 225337
codeticket: 225330
codeticket: 225328
codeticket: 225327
included in: 225344
included in: 225343
changeset: 15552:dcc9b83b29bf
parent: 15550:3f0988f415e7
parent: 15551:f2746b5c37a7
user: Andrew A. de Laix
date: Wed Mar 30 10:26:29 2011 -0700
summary: Automated merge with https://bitbucket.org/merov_linden/viewer-autobuild2010
included in: 225337
included in: 225330
included in: 225328
included in: 225327
changeset: 15551:f2746b5c37a7
parent: 15549:ab2527719a3b
user: Andrew A. de Laix
date: Wed Mar 30 10:26:16 2011 -0700
summary: update llqtwebkit archive on darwin.
codeticket: 225255
codeticket: 225252
codeticket: 225245
codeticket: 225135
included in: 225337
included in: 225330
included in: 225328
included in: 225327
changeset: 15549:ab2527719a3b
user: Andrew de Laix
date: Mon Mar 28 22:51:45 2011 +0000
summary: get naming of openallib right when packaging.
included in: 225255
included in: 225252
included in: 225245
included in: 225135
changeset: 15548:b8f1d6b8ddb1
user: Andrew de Laix
date: Mon Mar 28 22:49:53 2011 +0000
summary: well, that didn't work. Rollback..
codeticket: 225112
included in: 225255
included in: 225252
included in: 225245
included in: 225135
changeset: 15547:f73640ec940f
parent: 15545:e8c18edc09c9
parent: 15546:aed453efcd1d
user: Andrew A. de Laix
date: Mon Mar 28 14:00:48 2011 -0700
summary: Automated merge with https://bitbucket.org/merov_linden/viewer-autobuild2010
included in: 225112
changeset: 15546:aed453efcd1d
parent: 15536:f11a1d4cc557
user: Andrew A. de Laix
date: Mon Mar 28 14:00:35 2011 -0700
summary: fix CHOP-402: use newer api call for move to trash that will rename if needed.
codeticket: 225078
codeticket: 225076
included in: 225112
changeset: 15536:f11a1d4cc557
parent: 15115:65ff7415f171
parent: 15535:6b5d5e244e9f
user: Oz Linden
date: Sun Mar 27 06:39:42 2011 -0400
summary: merge out latest changes from viewer-development
codeticket: 225053
included in: 225078
included in: 225076
changeset: 15535:6b5d5e244e9f
user: alain@945battery-guestA-183.lindenlab.com
date: Fri Mar 25 13:58:23 2011 -0700
summary: revert packaging of openal libs.
included in: 225053
changeset: 15534:f71855b1ba97
parent: 15532:79671e9f35a7
parent: 15533:8020111162ef
user: alain@945battery-guestA-183.lindenlab.com
date: Fri Mar 25 13:40:47 2011 -0700
summary: merge backout
included in: 225053
changeset: 15533:8020111162ef
parent: 15530:6e69fbe64617
user: alain@945battery-guestA-183.lindenlab.com
date: Fri Mar 25 13:40:26 2011 -0700
summary: Backed out changeset 6e69fbe64617
included in: 225053
changeset: 15530:6e69fbe64617
parent: 15482:a34104edee9d
user: alain@945battery-guestA-183.lindenlab.com
date: Thu Mar 24 10:32:02 2011 -0700
summary: use vivox's openal for SLVoice because it isn't compatible with latest OpenAl version (should fix linux voice issues).
codeticket: 224901
included in: 225053
changeset: 15482:a34104edee9d
parent: 15481:fafe9f581410
parent: 15480:489acbc0ff39
user: alain@945battery-guestA-183.lindenlab.com
date: Wed Mar 23 15:27:27 2011 -0700
summary: Merge
codeticket: 224879
included in: 224901
changeset: 15480:489acbc0ff39
parent: 15479:44f214103cff
parent: 15478:f657912b9b03
user: Merov Linden
date: Wed Mar 23 13:40:56 2011 -0700
summary: Sync
codeticket: 224863
included in: 224879
changeset: 15478:f657912b9b03
user: alain@945battery-guestA-183.lindenlab.com
date: Wed Mar 23 10:44:39 2011 -0700
summary: Updated linux llqtwekit archive and fixed media webkit build and loading (fix CHOP-545).
codeticket: 224788
included in: 224863
changeset: 15477:9cc1323b4ec0
parent: 15476:857d917fb893
parent: 15475:270607e3ace1
user: Alain Linden
date: Tue Mar 22 10:58:25 2011 -0700
summary: Merge
included in: 224788
changeset: 15475:270607e3ace1
user: Andrew A. de Laix
date: Tue Mar 22 10:34:22 2011 -0700
summary: update freetype archive on darwin (downgrade to 2.3.9)
codeticket: 224933
codeticket: 224856
codeticket: 224850
codeticket: 224844
codeticket: 224683
included in: 224788
changeset: 15474:f7be65c71ad8
user: Oz Linden
date: Mon Mar 21 09:33:51 2011 -0400
summary: fix DOS line endings
included in: 224933
included in: 224856
included in: 224850
included in: 224844
included in: 224683
changeset: 15473:33308d4a00db
parent: 15100:a8639217816b
parent: 15472:a7f1a82d4606
user: Oz Linden
date: Mon Mar 21 09:31:49 2011 -0400
summary: pull updates to the start of 2.6.2 from viewer-development
codeticket: 224680
included in: 224933
included in: 224856
included in: 224850
included in: 224844
included in: 224683
changeset: 15472:a7f1a82d4606
user: Oz Linden
date: Sun Mar 20 07:48:29 2011 -0400
summary: document contributions from Nicky Perian
codeticket: 224679
included in: 224680
changeset: 15471:a96dd43430e2
parent: 15090:828cc2b7065b
parent: 15470:a9dac2f5d7c6
user: Oz Linden
date: Sun Mar 20 07:36:16 2011 -0400
summary: pull STORM-1089 beta fixes to autobuild2010 branch
codeticket: 224673
included in: 224679
changeset: 15470:a9dac2f5d7c6
parent: 15469:e9b24d6d636c
parent: 15468:3731b832df63
user: Merov Linden
date: Sat Mar 19 14:53:09 2011 -0700
summary: Sync with merov_linden/viewer-autobuild2010
codeticket: 224667
included in: 224673
changeset: 15468:3731b832df63
parent: 15082:152fbd163f10
parent: 15467:b1375698e7f0
user: Oz Linden
date: Sat Mar 19 06:32:13 2011 -0400
summary: merge out latest viewer-development
codeticket: 224668
codeticket: 224658
included in: 224667
changeset: 15467:b1375698e7f0
parent: 15460:54ed69f9c573
parent: 15466:4a78011d3a92
user: Oz Linden
date: Fri Mar 18 21:33:43 2011 -0400
summary: pull fix from merov_linden/viewer-autobuild2010
codeticket: 224652
included in: 224668
included in: 224658
changeset: 15466:4a78011d3a92
parent: 15465:62adb84552dc
parent: 15463:5778fddb0e23
user: Oz Linden
date: Fri Mar 18 19:56:37 2011 -0400
summary: Automated merge with file:///Users/oz/Work/viewer-vs2010
codeticket: 224645
included in: 224652
changeset: 15463:5778fddb0e23
parent: 15459:a8481d1568fb
parent: 15462:584ea80b13ec
user: Oz Linden
date: Fri Mar 18 19:47:34 2011 -0400
summary: Automated merge with ssh://bitbucket.org/merov_linden/viewer-autobuild2010
included in: 224645
changeset: 15462:584ea80b13ec
user: Oz Linden
date: Fri Mar 18 19:44:54 2011 -0400
summary: disable parallel linking in autobuild2010
codeticket: 224545
included in: 224645
changeset: 15461:18743e634cea
parent: 15444:ffcbd81e13d5
user: Oz Linden
date: Fri Mar 18 12:46:16 2011 -0400
summary: add build name parameters
codeticket: 224536
included in: 224545
changeset: 15444:ffcbd81e13d5
user: Oz Linden
date: Fri Mar 18 12:44:57 2011 -0400
summary: add upload of version-independent quicklinks
codeticket: 224521
included in: 224536
changeset: 15443:d913e8a9ef0e
user: Oz Linden
date: Fri Mar 18 08:25:29 2011 -0400
summary: configure oz_viewer-autobuild2010 for separate debug builds on windows
included in: 224521
changeset: 15442:b4b9561ff901
parent: 15076:039e1f72b314
parent: 15441:5b1c29ee7f5d
user: Oz Linden
date: Fri Mar 18 08:08:12 2011 -0400
summary: merge out 2.6.0 changes from viewer-development
codeticket: 224519
included in: 224521
changeset: 15441:5b1c29ee7f5d
user: Merov Linden
date: Thu Mar 17 22:51:23 2011 -0700
summary: Autobuild: Fix Mac building failure: c-ares linking of mac_updater
included in: 224519
changeset: 15440:d73cb359414b
parent: 15437:1ea736cca5de
parent: 15439:fc768d2f9750
user: Merov Linden
date: Thu Mar 17 21:34:01 2011 -0700
summary: Autobuild: pull in from jenn_linden/viewer-vs2010
codeticket: 224423
included in: 224519
changeset: 15439:fc768d2f9750
parent: 15436:4fe09e03bbf6
parent: 15438:2b12a9140bdb
user: Andrew de Laix
date: Thu Mar 17 21:49:00 2011 +0000
summary: Automated merge with https://bitbucket.org/jenn_linden/viewer-vs2010
included in: 224423
changeset: 15438:2b12a9140bdb
parent: 15433:f46e7895e75d
user: Andrew de Laix
date: Thu Mar 17 21:48:47 2011 +0000
summary: package .so links needed by linux webkit plugin.
codeticket: 224202
included in: 224423
changeset: 15433:f46e7895e75d
user: Andrew de Laix
date: Wed Mar 16 22:06:01 2011 +0000
summary: package all breakpad symlinks for linux.
codeticket: 224183
included in: 224202
changeset: 15432:4c4bc1d8ff0e
parent: 15430:f0ea081bef31
parent: 15431:d245ed8eb81e
user: Andrew de Laix
date: Wed Mar 16 20:54:18 2011 +0000
summary: Automated merge with https://bitbucket.org/jenn_linden/viewer-vs2010
included in: 224183
changeset: 15431:d245ed8eb81e
parent: 15421:2cca0613f4c2
user: Andrew de Laix
date: Wed Mar 16 20:54:12 2011 +0000
summary: update linux to lates curl archive (linked to cares).
codeticket: 224204
codeticket: 224127
included in: 224183
changeset: 15421:2cca0613f4c2
parent: 15419:b7d6de8031e5
parent: 15420:5bc8e5ef3f4e
user: Andrew de Laix
date: Wed Mar 16 16:06:56 2011 +0000
summary: Automated merge with https://bitbucket.org/jenn_linden/viewer-vs2010
included in: 224204
included in: 224127
changeset: 15420:5bc8e5ef3f4e
parent: 15418:bc8d41002e0a
user: Andrew de Laix
date: Wed Mar 16 16:06:47 2011 +0000
summary: rename google archive for linux to google-perftools and update to latest.
codeticket: 223998
included in: 224204
included in: 224127
changeset: 15418:bc8d41002e0a
user: Andrew de Laix
date: Tue Mar 15 20:54:22 2011 +0000
summary: update uuid archive for linux.
codeticket: 223980
included in: 223998
changeset: 15417:0626213272fa
parent: 15415:34fc813c9f37
user: Andrew de Laix
date: Tue Mar 15 19:58:25 2011 +0000
summary: update openal archive for linux.
codeticket: 223963
included in: 223980
changeset: 15415:34fc813c9f37
user: Andrew de Laix
date: Tue Mar 15 18:12:43 2011 +0000
summary: update jsoncpp archive on linux.
included in: 223963
changeset: 15414:60dbcba1944e
user: Andrew de Laix
date: Mon Mar 14 23:25:23 2011 +0000
summary: update zlib archive for linux.
included in: 223963
changeset: 15413:945557e86e0e
user: Andrew de Laix
date: Mon Mar 14 23:03:41 2011 +0000
summary: update xmlrpc-epi archive for linux.
included in: 223963
changeset: 15412:c8c749247e50
parent: 15409:521cf5d4704d
user: Andrew de Laix
date: Mon Mar 14 22:43:09 2011 +0000
summary: update openssl archive for linux.
codeticket: 223708
included in: 223963
changeset: 15409:521cf5d4704d
user: Andrew de Laix
date: Mon Mar 14 21:18:24 2011 +0000
summary: update openjpeg archive for linux.
included in: 223708
changeset: 15408:38f09dd88961
user: Andrew de Laix
date: Mon Mar 14 20:24:55 2011 +0000
summary: update ogg-vorbis archive for linux.
codeticket: 223667
included in: 223708
changeset: 15407:a3bbc0352282
user: Andrew de Laix
date: Mon Mar 14 20:01:31 2011 +0000
summary: update llqtwebkit usage.
included in: 223667
changeset: 15406:de8938e19cc1
user: Andrew de Laix
date: Fri Mar 11 23:50:00 2011 +0000
summary: update libpng archive for linux.
included in: 223667
changeset: 15405:352bda7f3cb4
user: Andrew de Laix
date: Fri Mar 11 23:39:38 2011 +0000
summary: update kdu archive for linux.
included in: 223667
changeset: 15404:0078ebe06338
user: Andrew de Laix
date: Fri Mar 11 19:32:18 2011 +0000
summary: update jpeglib archive for linux.
codeticket: 223505
included in: 223667
changeset: 15403:4b7f1fdc9146
user: Andrew de Laix
date: Fri Mar 11 19:17:14 2011 +0000
summary: package the exact shared library (manifest doesn't follow symlinks)
codeticket: 223435
included in: 223505
changeset: 15402:b103a59f6530
user: Andrew de Laix
date: Fri Mar 11 01:39:18 2011 +0000
summary: update google_breakpad archive for linux.
included in: 223435
changeset: 15401:ee705bb770c6
user: Andrew de Laix
date: Fri Mar 11 00:35:10 2011 +0000
summary: update freetype archive for linux.
included in: 223435
changeset: 15400:f0252c6b0bc2
user: Andrew de Laix
date: Fri Mar 11 00:27:44 2011 +0000
summary: update fontconfig archive for linux.
included in: 223435
changeset: 15399:50598b942ab8
user: Andrew de Laix
date: Fri Mar 11 00:16:23 2011 +0000
summary: fmod archive updated for linux.
codeticket: 223371
included in: 223435
changeset: 15398:6442f96ac507
user: Andrew de Laix
date: Thu Mar 10 22:55:22 2011 +0000
summary: update expat archive for linux.
codeticket: 223368
included in: 223371
changeset: 15397:0c0bab2916a9
user: Andrew de Laix
date: Thu Mar 10 22:43:33 2011 +0000
summary: remove ELFIO cruft; no longer needed now that we use google breakpad.
included in: 223368
changeset: 15396:479b7aa540f0
user: Andrew de Laix
date: Thu Mar 10 21:51:13 2011 +0000
summary: update dbusglib archive for linux.
codeticket: 223318
included in: 223368
changeset: 15395:6676874725dc
user: Andrew de Laix
date: Thu Mar 10 19:05:10 2011 +0000
summary: update curl archive for linux.
codeticket: 223316
included in: 223318
changeset: 15394:dd6a95848295
user: Andrew de Laix
date: Thu Mar 10 17:53:15 2011 +0000
summary: update boost archive usage for linux.
included in: 223316
changeset: 15393:e39890311668
user: Andrew de Laix
date: Thu Mar 10 01:31:40 2011 +0000
summary: ares archive updated for linux.
codeticket: 223299
codeticket: 223297
codeticket: 223295
codeticket: 223270
codeticket: 223269
included in: 223316
changeset: 15392:cc352d94de66
parent: 15390:2b939537254c
parent: 15391:3f41649ea043
user: Andrew de Laix
date: Thu Mar 10 00:48:36 2011 +0000
summary: Automated merge with https://bitbucket.org/jenn_linden/viewer-vs2010
included in: 223299
included in: 223297
included in: 223295
included in: 223270
included in: 223269
changeset: 15391:3f41649ea043
parent: 15385:83903003bdce
user: Andrew de Laix
date: Thu Mar 10 00:48:20 2011 +0000
summary: update apr and sdl archives for linux; added new archive db (needed for linux only).
codeticket: 222901
included in: 223299
included in: 223297
included in: 223295
included in: 223270
included in: 223269
changeset: 15385:83903003bdce
parent: 15383:7d3ef8254577
parent: 15384:eb9ed12407e6
user: Andrew A. de Laix
date: Mon Mar 07 16:36:00 2011 -0800
summary: merge fix to linux google_breakpad archive.
included in: 222901
changeset: 15384:eb9ed12407e6
parent: 15376:7f3922c6bbc4
user: Andrew A. de Laix
date: Mon Mar 07 16:35:08 2011 -0800
summary: Backed out changeset 7f3922c6bbc4 -- updated linux by mistake.
included in: 222901
changeset: 15376:7f3922c6bbc4
user: Andrew A. de Laix
date: Mon Mar 07 10:43:18 2011 -0800
summary: update mac google_breakpad archive.
codeticket: 222821
included in: 222901
changeset: 15375:e32f77fc6305
user: Andrew A. de Laix
date: Mon Mar 07 09:50:05 2011 -0800
summary: update darwin freetype archive.
included in: 222821
changeset: 15374:7d68763abe21
user: Andrew A. de Laix
date: Fri Mar 04 14:49:20 2011 -0800
summary: ares, boost, expat, freetype archives updated to latest builds.
included in: 222821
changeset: 15373:a895bb17846b
user: Andrew A. de Laix
date: Thu Mar 03 16:51:21 2011 -0800
summary: imported patch mac_archives
codeticket: 222666
included in: 222821
changeset: 15372:2b9d14530a5b
user: Alain Linden
date: Thu Mar 03 16:15:08 2011 -0800
summary: update to use new GL archive (includes only headers; that's all that is needed)
codeticket: 222650
included in: 222666
changeset: 15371:0003bbfbd9dd
user: Alain Linden
date: Thu Mar 03 14:42:48 2011 -0800
summary: hacky addition of VSTool postprocessing to set startup project and default configuration.
codeticket: 222648
included in: 222650
changeset: 15370:8a44059d9850
parent: 15356:cfb310548d77
parent: 15369:c818fcb11389
user: Alain Linden
date: Thu Mar 03 13:56:43 2011 -0800
summary: Automated merge with https://bitbucket.org/jenn_linden/viewer-vs2010
included in: 222648
changeset: 15369:c818fcb11389
user: Alain Linden
date: Thu Mar 03 11:23:09 2011 -0800
summary: resolve merge conflict.
included in: 222648
changeset: 15368:23e85b9f3fcd
parent: 14791:8596ccc522d9
parent: 15367:ffcf1b20f9ca
user: Alain Linden
date: Thu Mar 03 10:38:39 2011 -0800
summary: merge from lindenlab/viewer-development
included in: 222648
changeset: 15367:ffcf1b20f9ca
parent: 15355:3e7550806716
parent: 15366:e9e2d75ecf8d
user: Alain Linden
date: Wed Mar 02 15:07:04 2011 -0800
summary: Automated merge with https://bitbucket.org/jenn_linden/viewer-vs2010
included in: 222648
changeset: 15366:e9e2d75ecf8d
parent: 15349:2826344b89e9
user: Alain Linden
date: Wed Mar 02 14:50:49 2011 -0800
summary: update openjpeg package usage for windows.
codeticket: 222413
included in: 222648
changeset: 15349:2826344b89e9
user: Alain Linden
date: Tue Mar 01 16:27:04 2011 -0800
summary: add openal include path for openal dependent build.
codeticket: 222402
included in: 222413
changeset: 15348:47c923fbfa0d
parent: 15346:5f9acd9ed6e9
parent: 15347:46684beafa62
user: Alain Linden
date: Tue Mar 01 15:34:17 2011 -0800
summary: Automated merge with https://bitbucket.org/jenn_linden/viewer-vs2010
included in: 222402
changeset: 15347:46684beafa62
parent: 15343:d214a14ddb6f
user: Alain Linden
date: Tue Mar 01 15:32:35 2011 -0800
summary: fixes to get openal working on windows.
codeticket: 222365
included in: 222402
changeset: 15343:d214a14ddb6f
user: Jennifer Leech
date: Tue Mar 01 11:30:47 2011 -0800
summary: Added 'env|sort' to build.sh for debugging TC builds.
codeticket: 222305
included in: 222365
changeset: 15342:13aa99a92454
user: Jennifer Leech
date: Mon Feb 28 23:47:48 2011 -0800
summary: Take out symbol generation for slplugin.exe since this step currently fails, need to debug, but don't want it to be a blocker. This is expected to get TeamCity runs passing on Windows.
codeticket: 222115
included in: 222305
changeset: 15341:2f826bb61a81
parent: 15331:a707a0fdcc75
user: Jennifer Leech
date: Fri Feb 25 14:48:13 2011 -0800
summary: s/build-vc80/build-vc100/
codeticket: 222047
included in: 222115
changeset: 15331:a707a0fdcc75
parent: 15328:7c4b96df92d4
parent: 15330:95cddfec25b0
user: Jennifer Leech
date: Thu Feb 24 16:07:20 2011 -0800
summary: Automated merge with https://bitbucket.org/jenn_linden/viewer-vs2010
included in: 222047
changeset: 15330:95cddfec25b0
parent: 15322:1a13e171ddbf
parent: 15329:395e109db6c8
user: Jennifer Leech
date: Thu Feb 24 15:59:52 2011 -0800
summary: Merged changes from bitbucket.org/squire_linden/viewer-vs2010
included in: 222047
changeset: 15329:395e109db6c8
parent: 15303:614ff8828b0e
user: squire
date: Mon Feb 21 18:57:54 2011 -0800
summary: Changes windows build and PNG cmake to reflect latests libpng builds
Found Known Changeset:
codeticket: 221626
included in: 222047
changeset: 15303:614ff8828b0e
parent: 15298:04a4a28d0ae6
parent: 15300:9bb594cf9e5e
user: Andrew A. de Laix
date: Fri Feb 18 09:08:48 2011 -0800
summary: merge max fixes from merov.
codeticket: 221833
included in: 222047
changeset: 15322:1a13e171ddbf
user: Alain Linden
date: Tue Feb 22 14:54:28 2011 -0800
summary: windows uses updated ogg-vorbis archive.
codeticket: 221829
included in: 221833
changeset: 15321:a7566b44d9e8
user: Alain Linden
date: Tue Feb 22 13:13:02 2011 -0800
summary: update vstool to support vs2010.
included in: 221829
changeset: 15320:8b0439c3b594
parent: 15318:07d4841ea70c
parent: 15319:479817af64fa
user: Alain Linden
date: Tue Feb 22 10:50:31 2011 -0800
summary: Automated merge with https://bitbucket.org/jenn_linden/viewer-vs2010
Found Known Changeset:
codeticket: 225635
included in: 221829
changeset: 15319:479817af64fa
parent: 15309:177fc14fb671
user: Alain Linden
date: Tue Feb 22 10:49:32 2011 -0800
summary: update google_breakpad archive usage on windows.
codeticket: 221712
included in: 221829
changeset: 15318:07d4841ea70c
parent: 15315:5b7ea8baf25a
user: callum
date: Sat Feb 19 09:33:49 2011 -0800
summary: Pull in FreeType 2.4.4 for Windows (built using AutoBuild)
codeticket: 221708
included in: 221712
changeset: 15315:5b7ea8baf25a
parent: 15309:177fc14fb671
parent: 15314:a75c863354f4
user: brad kittenbrink
date: Fri Feb 18 18:33:43 2011 -0800
summary: Merge.
included in: 221708
changeset: 15314:a75c863354f4
user: brad kittenbrink
date: Fri Feb 18 18:32:06 2011 -0800
summary: Fix for failure to link Release builds due to :Release being an invalid path name on windows.
included in: 221708
changeset: 15313:1adc11ee0c4e
parent: 15307:f61c3dd079fa
user: brad kittenbrink
date: Fri Feb 18 18:31:19 2011 -0800
summary: Fix for packaging failure. Installer was missing the SecondLife.exe binary
Found Known Changeset:
codeticket: 221652
included in: 221708
changeset: 15307:f61c3dd079fa
parent: 15306:e200b614b6e1
parent: 15303:614ff8828b0e
user: callum
date: Fri Feb 18 13:35:27 2011 -0800
summary: Merge with head
Found Known Changeset:
codeticket: 221684
included in: 221708
changeset: 15309:177fc14fb671
parent: 15307:f61c3dd079fa
parent: 15308:9cd2d425f963
user: Alain Linden
date: Fri Feb 18 16:07:58 2011 -0800
summary: Automated merge with https://bitbucket.org/jenn_linden/viewer-vs2010
codeticket: 222038
included in: 222047
changeset: 15328:7c4b96df92d4
user: Alain Linden
date: Thu Feb 24 15:43:50 2011 -0800
summary: update to fixed debug google-mock archive.
codeticket: 222034
included in: 222038
changeset: 15327:f4c4c6557af5
user: Merov Linden
date: Thu Feb 24 14:07:03 2011 -0800
summary: Windows uses updated fmod archive and vs2010 compiled kdu archive.
codeticket: 222029
included in: 222034
changeset: 15326:94f5c74c4ca5
user: Alain Linden
date: Thu Feb 24 12:27:58 2011 -0800
summary: integrate xmlrpc-epi into windows build.
included in: 222029
changeset: 15325:e26ee5526686
parent: 15322:1a13e171ddbf
user: Alain Linden
date: Wed Feb 23 15:50:03 2011 -0800
summary: update windows to use new libndofdev and google-mock archives.
codeticket: 222393
included in: 222402
changeset: 15346:5f9acd9ed6e9
parent: 15344:527a652c0a54
parent: 15345:ae1b0acd59cb
user: Andrew A. de Laix
date: Tue Mar 01 15:23:23 2011 -0800
summary: Automated merge with https://bitbucket.org/jenn_linden/viewer-vs2010
included in: 222393
changeset: 15345:ae1b0acd59cb
parent: 15342:13aa99a92454
user: Andrew A. de Laix
date: Tue Mar 01 13:13:05 2011 -0800
summary: fix some mac build problems with library name changes with new packaages.
codeticket: 222389
included in: 222393
changeset: 15344:527a652c0a54
user: Jennifer Leech
date: Tue Mar 01 14:26:24 2011 -0800
summary: Setting TMP env var to be used during builds. Possible collision when using VS2010 with system-wide TMP directory.
codeticket: 222552
included in: 222648
changeset: 15355:3e7550806716
user: Jennifer Leech
date: Wed Mar 02 14:40:31 2011 -0800
summary: Make temporary disabling of Debug/Release builds broadened to all builds regardless of name.
codeticket: 222544
included in: 222552
changeset: 15354:b2e2e010b071
user: Andrew de Laix
date: Wed Mar 02 21:28:26 2011 +0000
summary: revert to old jsoncpp library on linux to fix build.
included in: 222544
changeset: 15353:bc25d49920e2
parent: 15351:b81f70e21c43
parent: 15352:de104f727dae
user: Andrew de Laix
date: Wed Mar 02 17:50:05 2011 +0000
summary: Automated merge with https://bitbucket.org/jenn_linden/viewer-vs2010
included in: 222544
changeset: 15352:de104f727dae
parent: 15318:07d4841ea70c
user: Andrew de Laix
date: Wed Mar 02 17:49:59 2011 +0000
summary: update to jsoncpp built with gcc4.1
codeticket: 222495
included in: 222544
changeset: 15351:b81f70e21c43
user: Jennifer Leech
date: Wed Mar 02 00:31:38 2011 -0800
summary: Attempting to modify quoting of build options string to see if this corrects failure to run BuildConsole on TC.
codeticket: 222464
included in: 222495
changeset: 15350:bf43fa280408
user: Jennifer Leech
date: Tue Mar 01 19:54:17 2011 -0800
summary: Attempting to configure VS2010 to only use one processor core to troubleshoot conflict with TC.
Found Known Changeset:
codeticket: 222612
included in: 222648
changeset: 14791:8596ccc522d9
user: eli_linden
date: Wed Mar 02 17:29:47 2011 -0800
summary: VWR-24992 FIX remove evil old parameters in localized xml files
codeticket: 222605
included in: 222648
changeset: 15356:cfb310548d77
user: Jennifer Leech
date: Wed Mar 02 16:42:03 2011 -0800
summary: RelWithDebInfo build succeeded on TeamCity! Re-enabling Degug and Release builds.
codeticket: 222897
included in: 222901
changeset: 15383:7d3ef8254577
user: Andrew A. de Laix
date: Mon Mar 07 16:18:09 2011 -0800
summary: updating zlib archive for darwin.
included in: 222897
changeset: 15382:2617bb2fcf17
user: Andrew A. de Laix
date: Mon Mar 07 16:08:56 2011 -0800
summary: update xmlrpc-epi archive for darwin.
included in: 222897
changeset: 15381:9ea392bf63ad
user: Andrew A. de Laix
date: Mon Mar 07 15:21:47 2011 -0800
summary: update pth archive usage for darwin.
included in: 222897
changeset: 15380:5c5ba40b9a93
user: Andrew A. de Laix
date: Mon Mar 07 15:09:15 2011 -0800
summary: update openjpeg archive usage for darwin.
included in: 222897
changeset: 15379:8638c7a0297a
user: Andrew A. de Laix
date: Mon Mar 07 14:54:50 2011 -0800
summary: update openSSL archive usage for darwin.
included in: 222897
changeset: 15378:57127b99e78a
user: Andrew A. de Laix
date: Mon Mar 07 14:23:09 2011 -0800
summary: update ogg-vorbis archive usage for darwin.
included in: 222897
changeset: 15377:2e867ebe1a64
user: Andrew A. de Laix
date: Mon Mar 07 11:44:51 2011 -0800
summary: update libpng and jpeglib archives for mac.
codeticket: 223230
codeticket: 223228
included in: 223299
included in: 223297
included in: 223295
included in: 223270
included in: 223269
changeset: 15390:2b939537254c
user: Andrew A. de Laix
date: Wed Mar 09 09:26:12 2011 -0800
summary: update glui archive for darwin.
included in: 223230
included in: 223228
changeset: 15389:c1b6dbb93b45
user: Andrew A. de Laix
date: Wed Mar 09 08:58:52 2011 -0800
summary: update ndofdev archive usage on darwin.
codeticket: 223132
codeticket: 223131
included in: 223230
included in: 223228
changeset: 15388:e9445a3397b8
user: Andrew A. de Laix
date: Tue Mar 08 14:14:57 2011 -0800
summary: update llqtwebkit usage on darwin.
included in: 223132
included in: 223131
changeset: 15387:5476ec050a1a
user: Andrew A. de Laix
date: Tue Mar 08 11:02:10 2011 -0800
summary: update fmod and kdu archive usage for mac.
included in: 223132
included in: 223131
changeset: 15386:f7f393694d16
user: Andrew A. de Laix
date: Tue Mar 08 09:18:44 2011 -0800
summary: really update google_breakpad archive usage for darwin.
codeticket: 224126
included in: 224204
included in: 224127
changeset: 15419:b7d6de8031e5
user: Andrew A. de Laix
date: Wed Mar 16 09:05:20 2011 -0700
summary: fix hash for curl archive on darwin.
included in: 224183
changeset: 15430:f0ea081bef31
parent: 15421:2cca0613f4c2
user: Andrew A. de Laix
date: Wed Mar 16 13:53:06 2011 -0700
summary: update to latest curl library (linked to cares).
codeticket: 224288
included in: 224423
changeset: 15436:4fe09e03bbf6
user: brad kittenbrink
date: Thu Mar 17 12:49:30 2011 -0400
summary: Removed trailing spaces that were breaking BuildParams parsing.
codeticket: 224269
codeticket: 224237
codeticket: 224224
included in: 224288
changeset: 15435:9a49dfdf48e1
parent: 15434:9df725d7ea8e
parent: 15433:f46e7895e75d
user: brad kittenbrink
date: Wed Mar 16 19:29:55 2011 -0400
summary: Merge.
included in: 224269
included in: 224237
included in: 224224
changeset: 15434:9df725d7ea8e
parent: 15421:2cca0613f4c2
user: brad kittenbrink
date: Wed Mar 16 19:29:14 2011 -0400
summary: Updated BuildParams in prep for vs2010 project viewer.
codeticket: 224344
included in: 224519
changeset: 15437:1ea736cca5de
parent: 15429:a822899219a7
parent: 15436:4fe09e03bbf6
user: Merov Linden
date: Thu Mar 17 11:24:22 2011 -0700
summary: Autobuild: pull in from jenn_linden/viewer-vs2010
codeticket: 224260
included in: 224344
changeset: 15429:a822899219a7
user: Merov Linden
date: Wed Mar 16 22:45:50 2011 -0700
summary: Autobuild: go back to ignoring errors on autobuild source_environment invocation for the moment
codeticket: 224245
included in: 224260
changeset: 15428:ae8eab8147ab
user: Merov Linden
date: Wed Mar 16 18:30:50 2011 -0700
summary: Autobuild: fixes an xml error that made configure exit with error
codeticket: 224241
included in: 224245
changeset: 15427:2f379b7dba00
parent: 15426:b7bb5ce4ad45
parent: 15425:b1814b819443
user: Merov Linden
date: Wed Mar 16 18:09:43 2011 -0700
summary: Sync with bitbucket master repo
codeticket: 224226
included in: 224241
changeset: 15425:b1814b819443
user: Christian Goetze (CG)
date: Wed Mar 16 16:44:19 2011 -0700
summary: Add a more precise error check for "autobuild source_environment".
codeticket: 224179
included in: 224226
changeset: 15424:2a8894f020d9
parent: 15423:11af8b9acd27
parent: 15422:bee49408828d
user: Christian Goetze (CG)
date: Wed Mar 16 12:31:04 2011 -0700
summary: Merged: Comment out setting of TMP, do not recompute AUTOBUILD if it is already defined.
codeticket: 224132
included in: 224179
changeset: 15422:bee49408828d
parent: 15416:963bfa3bfeeb
parent: 15421:2cca0613f4c2
user: Merov Linden
date: Wed Mar 16 09:51:46 2011 -0700
summary: Pull from jenn_linden/viewer-vs2010
codeticket: 224081
codeticket: 223968
included in: 224132
changeset: 15416:963bfa3bfeeb
parent: 15411:62611ce71715
parent: 15415:34fc813c9f37
user: Merov Linden
date: Tue Mar 15 11:41:10 2011 -0700
summary: Pull from jenn_linden/viewer-vs2010
codeticket: 223920
codeticket: 223900
included in: 224081
included in: 223968
changeset: 15411:62611ce71715
user: Merov Linden
date: Mon Mar 14 23:57:57 2011 -0700
summary: Fix Mac Json cmake script
included in: 223920
included in: 223900
changeset: 15410:30a722a4736c
parent: 15365:279fd82877a3
parent: 15409:521cf5d4704d
user: Merov Linden
date: Mon Mar 14 22:52:11 2011 -0700
summary: Pull from jenn_linden/viewer-vs2010
included in: 223920
included in: 223900
changeset: 15365:279fd82877a3
parent: 15363:c6d45fbf53b1
parent: 15364:0614df50422f
user: Merov Linden
date: Mon Mar 14 21:03:14 2011 -0700
summary: Pull from oz_linden/viewer-autobuild
codeticket: 223890
included in: 223920
included in: 223900
changeset: 15364:0614df50422f
parent: 15362:c9556a1645f3
user: Merov Linden
date: Mon Mar 14 21:00:27 2011 -0700
summary: Fix for Mac Debug build: no special debug libs for cares and jpeg libs
codeticket: 223544
included in: 223890
changeset: 15362:c9556a1645f3
parent: 14836:344d4c6d7d7e
parent: 15361:cef3d673f6d7
user: Oz Linden
date: Fri Mar 11 17:40:31 2011 -0500
summary: sync up to latest viewer-development
codeticket: 222711
included in: 223544
changeset: 15361:cef3d673f6d7
parent: 15359:516e4b15466d
user: Merov Linden
date: Thu Mar 03 23:11:38 2011 -0800
summary: Autobuild : Fix llsdmessage integration test failure on Mac
codeticket: 222633
included in: 222711
changeset: 15359:516e4b15466d
user: Merov Linden
date: Thu Mar 03 12:53:50 2011 -0800
summary: Autobuild : fix llcommon tests warning so Mac builds
included in: 222633
changeset: 15358:2d9b8d4cf88e
parent: 15339:7b27ba192e7e
user: Merov Linden
date: Thu Mar 03 11:28:06 2011 -0800
summary: Autobuild : points to the corrected pth package for Mac
included in: 222633
changeset: 15339:7b27ba192e7e
parent: 14791:8596ccc522d9
parent: 15338:5f0ab9443ece
user: Oz Linden
date: Thu Mar 03 07:20:04 2011 -0500
summary: merge up from viewer-development
codeticket: 222075
included in: 222633
changeset: 15338:5f0ab9443ece
parent: 15336:c8fd7e6225df
user: Oz Linden
date: Fri Feb 25 12:36:17 2011 -0500
summary: update to TeamCity build from https://bitbucket.org/lindenlab/3p-elfio
codeticket: 222057
included in: 222075
changeset: 15336:c8fd7e6225df
user: Oz Linden
date: Thu Feb 24 21:40:18 2011 -0500
summary: change to canonical build of the pth lib
codeticket: 222020
included in: 222057
changeset: 15335:33458e1775be
user: Oz Linden
date: Thu Feb 24 14:24:01 2011 -0500
summary: use our own domain for llhost_test; linux.org changed dns and broke it
codeticket: 221926
included in: 222020
changeset: 15334:43d043381919
parent: 14755:1bc100746447
parent: 15292:81ad32eb2574
user: Oz Linden
date: Wed Feb 23 15:56:28 2011 -0500
summary: Automated merge with ssh://hg@bitbucket.org/lindenlab/viewer-development
codeticket: 221544
included in: 221926
changeset: 15292:81ad32eb2574
parent: 14749:c10d5e37db1e
parent: 15291:3fb9639629ee
user: Oz Linden
date: Thu Feb 17 15:15:06 2011 -0500
summary: Automated merge with file:///Users/oz/Work/V-DR
included in: 221544
changeset: 15291:3fb9639629ee
parent: 14748:aa3013a682c6
parent: 15288:4e9d48dbf286
user: Oz Linden
date: Thu Feb 17 14:56:33 2011 -0500
summary: merge changes for storm-937
codeticket: 221520
included in: 221544
changeset: 15288:4e9d48dbf286
parent: 15280:85338cc8477a
user: Oz Linden
date: Thu Feb 17 12:39:01 2011 -0500
summary: try disabling parallel builds in TC for Linux
codeticket: 221497
included in: 221520
changeset: 15280:85338cc8477a
parent: 15249:2e4533a2b5d6
user: Oz Linden
date: Wed Feb 16 20:58:49 2011 -0500
summary: fix dos line endings
codeticket: 221445
included in: 221497
changeset: 15249:2e4533a2b5d6
parent: 14745:379da6bd50a5
parent: 15248:c2fea1e01f25
user: Oz Linden
date: Wed Feb 16 18:18:34 2011 -0500
summary: merging in latest viewer-development
codeticket: 221073
included in: 221445
changeset: 15248:c2fea1e01f25
parent: 15247:f761b8da1666
parent: 15241:b863268772b8
user: Oz Linden
date: Fri Feb 11 14:06:27 2011 -0500
summary: merge local changes
codeticket: 220835
included in: 221073
changeset: 15241:b863268772b8
user: Oz Linden
date: Thu Feb 10 14:41:00 2011 -0500
summary: OPEN-1: (partial) use environment when building with Visual Studio Express
codeticket: 220452
included in: 220835
changeset: 15240:21ef0a07c2cd
user: Oz Linden
date: Sun Feb 06 10:37:42 2011 -0500
summary: OPEN-1 WORKAROUND correct build arguments again for VS Express
codeticket: 220451
included in: 220452
changeset: 15239:a3dadd56ab8a
user: Oz Linden
date: Sun Feb 06 10:09:58 2011 -0500
summary: OPEN-1 WORKAROUND correct build arguments for VS Express
codeticket: 220450
included in: 220451
changeset: 15238:1be8f1688c4c
user: Oz Linden
date: Sun Feb 06 09:56:09 2011 -0500
summary: OPEN-1 WORKAROUND revert change to cmake string for VS 8
codeticket: 220449
included in: 220450
changeset: 15237:47828139990f
parent: 15235:f7f6722222ec
user: Oz Linden
date: Sun Feb 06 08:50:06 2011 -0500
summary: OPEN-1 WORKAROUND - create a VCexpressRelWithDebInfo for compiling with VS Express
included in: 220449
changeset: 15235:f7f6722222ec
parent: 14712:b0bceb572090
parent: 15234:9f7160b85600
user: Oz Linden
date: Sun Feb 06 07:29:30 2011 -0500
summary: merge to latest viewer-development
included in: 220449
changeset: 15234:9f7160b85600
parent: 15232:00453191c1b9
parent: 15233:16ebabf35dd8
user: Oz Linden
date: Thu Jan 27 09:28:57 2011 -0500
summary: update autobuild configuration
included in: 220449
changeset: 15233:16ebabf35dd8
parent: 14611:38ed1abd9cd9
parent: 15229:57d9f93978a7
user: Oz Linden
date: Tue Jan 25 17:11:56 2011 -0500
summary: Automated merge with file:///Users/oz/Work/V-D
Found Known Changeset:
codeticket: 219572
included in: 220449
changeset: 15229:57d9f93978a7
user: Andrew A. de Laix
date: Mon Jan 24 16:00:52 2011 -0800
summary: hack to work around gcc 4.2 compiler warning; really we should not store static strings in char * pointers (they should all be changed to const char *).
Found Known Changeset:
codeticket: 219652
included in: 220449
changeset: 14611:38ed1abd9cd9
user: Vadim ProductEngine
date: Tue Jan 25 17:10:23 2011 -0500
summary: correct build error
codeticket: 219773
included in: 220449
changeset: 15232:00453191c1b9
user: Alain Linden
date: Wed Jan 26 16:09:40 2011 -0800
summary: fix quoting of vs8 generator string.
included in: 219773
changeset: 15231:43b4b7927c00
user: Andrew A. de Laix
date: Wed Jan 26 15:57:48 2011 -0800
summary: adding OpenSource* and OpenSourceStandAlone* configurations.
codeticket: 219700
included in: 219773
changeset: 15230:883c716200d2
user: Andrew A. de Laix
date: Wed Jan 26 09:07:20 2011 -0800
summary: windows uses llqtwebkit now published on s3.
Found Known Changeset:
codeticket: 219572
included in: 219700
changeset: 15229:57d9f93978a7
user: Andrew A. de Laix
date: Mon Jan 24 16:00:52 2011 -0800
summary: hack to work around gcc 4.2 compiler warning; really we should not store static strings in char * pointers (they should all be changed to const char *).
Found Known Changeset:
codeticket: 220434
included in: 220449
changeset: 14712:b0bceb572090
user: Merov Linden
date: Fri Feb 04 16:38:26 2011 -0800
summary: STORM-610 : Backing out that change (test fail)
included in: 221073
changeset: 15247:f761b8da1666
user: Oz Linden
date: Thu Feb 10 14:41:00 2011 -0500
summary: OPEN-1: (partial) use environment when building with Visual Studio Express
included in: 221073
changeset: 15246:12356d450fa0
user: Oz Linden
date: Sun Feb 06 10:37:42 2011 -0500
summary: OPEN-1 WORKAROUND correct build arguments again for VS Express
included in: 221073
changeset: 15245:419b47a9be01
user: Oz Linden
date: Sun Feb 06 10:09:58 2011 -0500
summary: OPEN-1 WORKAROUND correct build arguments for VS Express
included in: 221073
changeset: 15244:bb7b99da29d1
user: Oz Linden
date: Sun Feb 06 09:56:09 2011 -0500
summary: OPEN-1 WORKAROUND revert change to cmake string for VS 8
included in: 221073
changeset: 15243:b57992a19f4c
user: Oz Linden
date: Sun Feb 06 08:50:06 2011 -0500
summary: OPEN-1 WORKAROUND - create a VCexpressRelWithDebInfo for compiling with VS Express
included in: 221073
changeset: 15242:a59f8eccc846
parent: 14740:92e58e51776a
parent: 15236:adfa3e3494e5
user: Oz Linden
date: Mon Feb 14 09:50:39 2011 -0500
summary: merge up to latest viewer-development
included in: 221073
changeset: 15236:adfa3e3494e5
parent: 15235:f7f6722222ec
parent: 14735:a2773f1fdfcf
user: Oz Linden
date: Fri Feb 11 12:54:12 2011 -0500
summary: merge up to lastest upstream
Found Known Changeset:
codeticket: 220951
included in: 221073
changeset: 14735:a2773f1fdfcf
parent: 14734:e5176946eb04
parent: 14733:ec4ad7e3ecca
user: Oz Linden
date: Fri Feb 11 11:38:27 2011 -0500
summary: pull back release tag from viewer-beta
Found Known Changeset:
codeticket: 221037
included in: 221073
changeset: 14740:92e58e51776a
parent: 14737:c1f97b742cfb
parent: 14739:a82bc930924a
user: Merov Linden
date: Fri Feb 11 17:42:37 2011 -0800
summary: STORM-975 : pull into viewer-development
Found Known Changeset:
codeticket: 221399
included in: 221445
changeset: 14745:379da6bd50a5
parent: 14744:d6736e2c4ba4
parent: 14743:2bf5c7f3c305
user: Oz Linden
date: Wed Feb 16 15:52:05 2011 -0500
summary: merge changes for storm-981
Found Known Changeset:
codeticket: 221029
included in: 221544
changeset: 14748:aa3013a682c6
user: Merov Linden
date: Fri Feb 11 16:56:28 2011 -0800
summary: STORM-937 : Use subprocess instead os commands in python, suppress crufty svn code
Found Known Changeset:
codeticket: 221543
included in: 221544
changeset: 14749:c10d5e37db1e
parent: 14748:aa3013a682c6
parent: 14745:379da6bd50a5
user: Oz Linden
date: Thu Feb 17 15:09:50 2011 -0500
summary: merge changes for storm-937
Found Known Changeset:
codeticket: 221902
included in: 221926
changeset: 14755:1bc100746447
user: Xiaohong Bao
date: Wed Feb 23 11:41:13 2011 -0700
summary: separate vertex buffer and index buffer when map/unmap VBO. can be treated as part of STORM-1011.
Found Known Changeset:
codeticket: 222612
included in: 222633
changeset: 14791:8596ccc522d9
user: eli_linden
date: Wed Mar 02 17:29:47 2011 -0800
summary: VWR-24992 FIX remove evil old parameters in localized xml files
Found Known Changeset:
codeticket: 223434
included in: 223544
changeset: 14836:344d4c6d7d7e
user: Oz Linden
date: Thu Mar 10 20:27:45 2011 -0500
summary: increment version to 2.5.3
codeticket: 223550
included in: 223920
included in: 223900
changeset: 15363:c6d45fbf53b1
parent: 15362:c9556a1645f3
parent: 15360:aee2a56261c6
user: Oz Linden
date: Fri Mar 11 19:42:26 2011 -0500
summary: sync up to latest viewer-development
included in: 223550
changeset: 15360:aee2a56261c6
parent: 15359:516e4b15466d
parent: 15357:d15fe1b44d04
user: Oz Linden
date: Thu Mar 03 21:18:15 2011 -0500
summary: pull up changes from viewer-autobuild
included in: 223550
changeset: 15357:d15fe1b44d04
parent: 15356:cfb310548d77
parent: 15340:166565d65316
user: Oz Linden
date: Thu Mar 03 07:50:40 2011 -0500
summary: pull latest changes from viewer-vs2010
included in: 223550
changeset: 15340:166565d65316
parent: 15339:7b27ba192e7e
parent: 15337:8a50c1a8428d
user: Oz Linden
date: Thu Mar 03 07:20:54 2011 -0500
summary: merge up from viewer-development and viewer-autobuild
codeticket: 222062
included in: 223550
changeset: 15337:8a50c1a8428d
parent: 15336:c8fd7e6225df
parent: 15333:183e2f5dd8fc
user: Oz Linden
date: Thu Feb 24 22:31:35 2011 -0500
summary: sync to latest viewer-development and viewer-autobuild
included in: 222062
changeset: 15333:183e2f5dd8fc
parent: 15332:cef2802c160d
parent: 15305:07163388fcb9
user: Oz Linden
date: Thu Feb 24 22:27:08 2011 -0500
summary: pull latest changes from viewer-vs2010
codeticket: 221629
included in: 222062
changeset: 15305:07163388fcb9
parent: 15302:ed35dc91644b
parent: 15304:b27cad23805c
user: Oz Linden
date: Fri Feb 18 12:50:16 2011 -0500
summary: pull changes from vs2010
codeticket: 221625
included in: 221629
changeset: 15304:b27cad23805c
parent: 15303:614ff8828b0e
parent: 15301:51e52c3074d6
user: Oz Linden
date: Fri Feb 18 12:49:07 2011 -0500
summary: Automated merge with ssh://bitbucket.org/jenn_linden/viewer-vs2010
codeticket: 221614
included in: 221625
changeset: 15301:51e52c3074d6
parent: 15300:9bb594cf9e5e
parent: 15298:04a4a28d0ae6
user: Oz Linden
date: Fri Feb 18 06:03:03 2011 -0500
summary: merge mac autobuild fix from Merov
Found Known Changeset:
codeticket: 221596
included in: 221614
changeset: 15298:04a4a28d0ae6
parent: 15296:339c25d7046e
parent: 15297:e8285c0ada35
user: Alain Linden
date: Thu Feb 17 17:50:13 2011 -0800
summary: Automated merge with https://bitbucket.org/jenn_linden/viewer-vs2010
included in: 221614
changeset: 15300:9bb594cf9e5e
parent: 15286:028ac6be49dd
user: Merov Linden
date: Thu Feb 17 21:13:48 2011 -0800
summary: Autobuild: fix for Mac build using XCode
Found Known Changeset:
codeticket: 221527
included in: 221614
changeset: 15286:028ac6be49dd
parent: 15284:88b5fadf10c3
user: Andrew A. de Laix
date: Thu Feb 17 09:50:08 2011 -0800
summary: explicity call python scripts with python so they work on all platforms.
Found Known Changeset:
codeticket: 221626
included in: 221625
changeset: 15303:614ff8828b0e
parent: 15298:04a4a28d0ae6
parent: 15300:9bb594cf9e5e
user: Andrew A. de Laix
date: Fri Feb 18 09:08:48 2011 -0800
summary: merge max fixes from merov.
codeticket: 221615
included in: 221629
changeset: 15302:ed35dc91644b
parent: 15301:51e52c3074d6
parent: 15299:8c64656b4d2a
user: Oz Linden
date: Fri Feb 18 06:15:12 2011 -0500
summary: merge changes for viewer-vs2010
codeticket: 221595
included in: 221615
changeset: 15299:8c64656b4d2a
parent: 15295:276b2bf4bd2d
parent: 15298:04a4a28d0ae6
user: Oz Linden
date: Thu Feb 17 21:01:23 2011 -0500
summary: merge changes from jenn_linden/viewer-vs2010
Found Known Changeset:
codeticket: 221596
included in: 221595
changeset: 15298:04a4a28d0ae6
parent: 15296:339c25d7046e
parent: 15297:e8285c0ada35
user: Alain Linden
date: Thu Feb 17 17:50:13 2011 -0800
summary: Automated merge with https://bitbucket.org/jenn_linden/viewer-vs2010
codeticket: 221570
included in: 221595
changeset: 15295:276b2bf4bd2d
parent: 15294:2e595620547d
parent: 15293:db4c03cda5c1
user: Oz Linden
date: Thu Feb 17 18:52:15 2011 -0500
summary: Automated merge with file:///Users/oz/Work/viewer-vs2010
included in: 221570
changeset: 15293:db4c03cda5c1
parent: 15292:81ad32eb2574
parent: 15290:5bd6e83492bf
user: Oz Linden
date: Thu Feb 17 18:46:17 2011 -0500
summary: merge up from viewer-autobuild
included in: 221570
changeset: 15290:5bd6e83492bf
user: Oz Linden
date: Thu Feb 17 18:46:04 2011 -0500
summary: adjust parameters for integration build
codeticket: 221536
included in: 221570
changeset: 15289:469209f0de95
parent: 15288:4e9d48dbf286
parent: 15287:43e747ced209
user: Oz Linden
date: Thu Feb 17 13:52:53 2011 -0500
summary: merge changes for viewer-autobuild
included in: 221536
changeset: 15287:43e747ced209
parent: 15285:2d5deb1fbd81
parent: 15286:028ac6be49dd
user: Oz Linden
date: Thu Feb 17 13:51:50 2011 -0500
summary: merge lastest changes from viewer-vs2010
Found Known Changeset:
codeticket: 221527
included in: 221536
changeset: 15286:028ac6be49dd
parent: 15284:88b5fadf10c3
user: Andrew A. de Laix
date: Thu Feb 17 09:50:08 2011 -0800
summary: explicity call python scripts with python so they work on all platforms.
codeticket: 221499
included in: 221536
changeset: 15285:2d5deb1fbd81
parent: 15284:88b5fadf10c3
parent: 15281:895e7e07aa76
user: Oz Linden
date: Wed Feb 16 21:54:57 2011 -0500
summary: Automated merge with ssh://bitbucket.org/jenn_linden/viewer-vs2010
included in: 221499
changeset: 15281:895e7e07aa76
parent: 15280:85338cc8477a
parent: 15279:daac7e5767e1
user: Oz Linden
date: Wed Feb 16 21:53:52 2011 -0500
summary: Automated merge with file:///Users/oz/Work/viewer-autobuild
codeticket: 221446
included in: 221499
changeset: 15279:daac7e5767e1
parent: 15278:0dcb26105761
parent: 15249:2e4533a2b5d6
user: Oz Linden
date: Wed Feb 16 18:24:03 2011 -0500
summary: Automated merge with ssh://bitbucket.org/jenn_linden/viewer-vs2010
Found Known Changeset:
codeticket: 225637
codeticket: 221430
included in: 221446
changeset: 15278:0dcb26105761
user: Alain Linden
date: Wed Feb 16 14:06:50 2011 -0800
summary: use new packages.
Found Known Changeset:
codeticket: 221468
included in: 221499
changeset: 15284:88b5fadf10c3
user: Alain Linden
date: Wed Feb 16 16:39:33 2011 -0800
summary: turn off parallel linux builds; they don't work for autobuild driven builds.
Found Known Changeset:
codeticket: 221551
included in: 221570
changeset: 15294:2e595620547d
parent: 15286:028ac6be49dd
user: Christian Goetze (CG)
date: Thu Feb 17 12:09:10 2011 -0800
summary: Cherrypick Merov's fix for update_version_files.py.
codeticket: 223574
codeticket: 222061
included in: 222062
changeset: 15332:cef2802c160d
parent: 15331:a707a0fdcc75
parent: 15324:1bb165b1f104
user: Oz Linden
date: Thu Feb 24 22:23:13 2011 -0500
summary: Automated merge with ssh://bitbucket.org/jenn_linden/viewer-vs2010
codeticket: 221890
included in: 223574
included in: 222061
changeset: 15324:1bb165b1f104
user: Nicky
date: Sat Feb 19 20:27:38 2011 +0100
summary: Do not add /include/json as an include director. Instead use /include.
included in: 221890
changeset: 15323:d8d70c4d4ab7
parent: 15322:1a13e171ddbf
parent: 15317:7e7f4263797a
user: Oz Linden
date: Wed Feb 23 06:47:57 2011 -0500
summary: Automated merge with ssh://bitbucket.org/jenn_linden/viewer-vs2010
included in: 221890
changeset: 15317:7e7f4263797a
user: Oz Linden
date: Mon Feb 21 07:19:24 2011 -0500
summary: change host reverse lookup test to use our own host (linux.org failed)
codeticket: 221711
included in: 221890
changeset: 15316:199ec6fa8fa3
parent: 15315:5b7ea8baf25a
parent: 15312:de9d06537793
user: Oz Linden
date: Sat Feb 19 11:40:11 2011 -0500
summary: Automated merge with ssh://bitbucket.org/jenn_linden/viewer-vs2010
codeticket: 221709
included in: 221711
changeset: 15312:de9d06537793
user: Oz Linden
date: Sat Feb 19 07:28:34 2011 -0500
summary: make sure parallel builds are off for my test repos (and clean out some obsolete entries)
codeticket: 221705
included in: 221709
changeset: 15311:efda27236f8b
user: Oz Linden
date: Fri Feb 18 21:29:25 2011 -0500
summary: use improved packaging for jsoncpp
included in: 221705
changeset: 15310:cd519ff725c7
parent: 15304:b27cad23805c
parent: 15309:177fc14fb671
user: Oz Linden
date: Fri Feb 18 21:36:27 2011 -0500
summary: Automated merge with ssh://bitbucket.org/oz_linden/viewer-vs2010
Found Known Changeset:
codeticket: 221684
included in: 221705
changeset: 15309:177fc14fb671
parent: 15307:f61c3dd079fa
parent: 15308:9cd2d425f963
user: Alain Linden
date: Fri Feb 18 16:07:58 2011 -0800
summary: Automated merge with https://bitbucket.org/jenn_linden/viewer-vs2010
included in: 224179
changeset: 15423:11af8b9acd27
parent: 15416:963bfa3bfeeb
user: Christian Goetze (CG)
date: Wed Mar 16 12:30:41 2011 -0700
summary: Comment out setting of TMP, do not recompute AUTOBUILD if it is already defined.
included in: 224241
changeset: 15426:b7bb5ce4ad45
parent: 15422:bee49408828d
user: Merov Linden
date: Wed Mar 16 18:09:00 2011 -0700
summary: Autobuild 2010: clean up argument passing for all configs
Found Known Changeset:
codeticket: 224500
codeticket: 224412
included in: 224521
changeset: 15076:039e1f72b314
parent: 15075:a8f13b31b38b
parent: 15074:6ed95486d3ec
user: Oz Linden
date: Thu Mar 17 14:56:01 2011 -0400
summary: merge changes for storm-1016
codeticket: 224641
included in: 224645
changeset: 15459:a8481d1568fb
user: Merov Linden
date: Fri Mar 18 16:23:55 2011 -0700
summary: Autobuild : fixed merge errors in json hash codes
included in: 224641
changeset: 15458:64103a32c464
parent: 15450:6f11fb666ced
parent: 15457:b21b57fcf4a4
user: Merov Linden
date: Fri Mar 18 15:39:31 2011 -0700
summary: STORM-1023, STORM-1022 : pull into viewer-autobuild2010
included in: 224641
changeset: 15457:b21b57fcf4a4
parent: 15456:9112d863c131
parent: 15441:5b1c29ee7f5d
user: Merov Linden
date: Thu Mar 17 23:20:27 2011 -0700
summary: Pull in merov_linden/viewer-autobuild2010
included in: 224641
changeset: 15456:9112d863c131
parent: 15455:4e52ba1a4ab3
parent: 15437:1ea736cca5de
user: Merov Linden
date: Thu Mar 17 23:19:39 2011 -0700
summary: Pull in merov_linden/viewer-autobuild2010
included in: 224641
changeset: 15455:4e52ba1a4ab3
user: Merov Linden
date: Sat Mar 05 19:18:39 2011 -0800
summary: STORM-1023 : add missing fmod dependency so viewer can compile with -DFMOD_INCLUDE_DIR option
included in: 224641
changeset: 15454:94baceef1e3b
user: Merov Linden
date: Fri Mar 04 22:56:15 2011 -0800
summary: STORM-1023 : allow non standalone and non install prebuilt to use local fmod package path in autobuild.xml
included in: 224641
changeset: 15453:25de808fc9f6
parent: 15452:62a18815af95
parent: 15361:cef3d673f6d7
user: Merov Linden
date: Fri Mar 04 13:13:59 2011 -0800
summary: pull from oz_linden/viewer-autobuild
included in: 224641
changeset: 15452:62a18815af95
parent: 15451:e439abf2be8e
parent: 15338:5f0ab9443ece
user: Merov Linden
date: Wed Mar 02 11:52:45 2011 -0800
summary: Pull from oz_linden/viewer-autobuild
included in: 224641
changeset: 15451:e439abf2be8e
parent: 15334:43d043381919
user: Merov Linden
date: Thu Feb 24 20:57:34 2011 -0800
summary: STORM-1023 (was OPEN-4) and STORM-1022 (was OPEN-24) : fmod and kdu changes : cmake changes making possible to use Findxxx when INSTALL_PROPRIETARY is OFF and STANDALONE is OFF too, simplify cmake scripts around INSTALL_PROPRIETARY, add fmodex to FindFMOD
included in: 224641
changeset: 15450:6f11fb666ced
parent: 15448:0ee9b930517c
parent: 15449:d2be4f9a5704
user: Merov Linden
date: Fri Mar 18 15:35:20 2011 -0700
summary: OPEN-37 : pull into viewer-autobuild2010
included in: 224641
changeset: 15449:d2be4f9a5704
parent: 15441:5b1c29ee7f5d
user: Wolfpup Lowenhar
date: Fri Mar 18 08:05:36 2011 -0400
summary: OPEN-1: OPEN-37: Needed changes in autobuild.xml for OpenSource Developers to be able to
included in: 224641
changeset: 15448:0ee9b930517c
parent: 15444:ffcbd81e13d5
parent: 15447:a05787908cb0
user: Merov Linden
date: Fri Mar 18 15:33:14 2011 -0700
summary: Autobuild: pull in from jenn_linden/viewer-vs2010
codeticket: 224606
included in: 224641
changeset: 15447:a05787908cb0
user: Andrew A. de Laix
date: Fri Mar 18 11:49:44 2011 -0700
summary: update archives to permanent S3 locations.
codeticket: 224534
included in: 224606
changeset: 15446:505fe86f45a3
user: brad kittenbrink
date: Fri Mar 18 12:28:08 2011 -0400
summary: Added passing of viewer_channel to the autobuild configure line.
included in: 224534
changeset: 15445:7d45f6b008aa
parent: 15439:fc768d2f9750
user: brad kittenbrink
date: Fri Mar 18 12:24:04 2011 -0400
summary: Removal of dbghelp cruft.
codeticket: 224666
codeticket: 224642
included in: 224652
changeset: 15465:62adb84552dc
user: brad kittenbrink
date: Fri Mar 18 19:35:25 2011 -0400
summary: Disabled redundant configuration step during the build in build.sh.
included in: 224666
included in: 224642
changeset: 15464:a64f612d838c
parent: 15447:a05787908cb0
user: brad kittenbrink
date: Fri Mar 18 19:30:59 2011 -0400
summary: Fix for broken escaping of viewer_channel variable at configuration time.
codeticket: 224650
included in: 224668
included in: 224658
changeset: 15460:54ed69f9c573
user: Merov Linden
date: Fri Mar 18 16:47:43 2011 -0700
summary: Autobuild : Fix merge snaffu in Json cmake file
Found Known Changeset:
codeticket: 224657
included in: 224667
changeset: 15082:152fbd163f10
user: Oz Linden
date: Fri Mar 18 20:59:10 2011 -0400
summary: set build parameters for open dev projects
included in: 224673
changeset: 15469:e9b24d6d636c
parent: 15460:54ed69f9c573
user: Merov Linden
date: Sat Mar 19 14:52:08 2011 -0700
summary: Autobuild : Fix to point all Windows build configs to Visual Studio 10
Found Known Changeset:
codeticket: 224674
included in: 224679
changeset: