livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
14,924 Commits
2 Branches
0 Tags
319 MiB
Commit Graph

14924 Commits (58e5c8476dfd30f8d303ce5a60db872066008b83)

Author SHA1 Message Date
Alain Linden 58e5c8476d update to use new GL archive (includes only headers; that's all that is needed) 2011-03-03 16:15:08 -08:00
Alain Linden 9bd9a55608 hacky addition of VSTool postprocessing to set startup project and default configuration. 2011-03-03 14:42:48 -08:00
Alain Linden ba1d1267fe Automated merge with https://bitbucket.org/jenn_linden/viewer-vs2010 2011-03-03 13:56:43 -08:00
Alain Linden d0ed06ffca resolve merge conflict. 2011-03-03 11:23:09 -08:00
Alain Linden 8dffedb246 merge from lindenlab/viewer-development 2011-03-03 10:38:39 -08:00
eli_linden aa72b0df03 VWR-24992 FIX remove evil old parameters in localized xml files 2011-03-02 17:29:47 -08:00
Jennifer Leech 0d93ce2e4a RelWithDebInfo build succeeded on TeamCity! Re-enabling Degug and Release builds. 2011-03-02 16:42:03 -08:00
Alain Linden fa20a6de08 Automated merge with https://bitbucket.org/jenn_linden/viewer-vs2010 2011-03-02 15:07:04 -08:00
Alain Linden f680c91a09 update openjpeg package usage for windows. 2011-03-02 14:50:49 -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
eli_linden 9259f3a6bc VWR-24754 FIX from Torben Troutman 2011-03-02 13:37:38 -08:00
Andrew de Laix 99ba5e2670 revert to old jsoncpp library on linux to fix build. 2011-03-02 21:28:26 +00:00
eli_linden 8e74e29bc7 VWR-23494 FIX on behalf of Torban Troutman 2011-03-02 11:31:29 -08:00
Andrew de Laix 49f5a3ec7d Automated merge with https://bitbucket.org/jenn_linden/viewer-vs2010 2011-03-02 17:50:05 +00:00
Andrew de Laix 899d0d6282 update to jsoncpp built with gcc4.1 2011-03-02 17:49:59 +00:00
Jennifer Leech 9256402b06 Attempting to modify quoting of build options string to see if this corrects failure to run BuildConsole on TC. 2011-03-02 00:31:38 -08:00
Jennifer Leech 7093503e26 Attempting to configure VS2010 to only use one processor core to troubleshoot conflict with TC. 2011-03-01 19:54:17 -08:00
Alain Linden f228cebc77 add openal include path for openal dependent build. 2011-03-01 16:27:04 -08:00
Merov Linden 22198656b7 Added tag 2.5.1-start for changeset 63a6aedfce78 2011-03-01 15:46:03 -08:00
Merov Linden 268f528ca1 Set the version to 2.5.1... Yeap! Back from 2.7.0 (not a misprint) 2011-03-01 15:45:43 -08:00
Alain Linden 52e107e419 Automated merge with https://bitbucket.org/jenn_linden/viewer-vs2010 2011-03-01 15:34:17 -08:00
Alain Linden 88f507f9cc fixes to get openal working on windows. 2011-03-01 15:32:35 -08:00
Merov Linden 0748420c94 STORM-1004 : pull into viewer-development 2011-03-01 15:24:52 -08:00
Andrew A. de Laix 31d673cb51 Automated merge with https://bitbucket.org/jenn_linden/viewer-vs2010 2011-03-01 15:23:23 -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
Andrew A. de Laix c5aaefe37f fix some mac build problems with library name changes with new packaages. 2011-03-01 13:13:05 -08:00
Merov Linden 2ef66a7cfa STORM-954 : pull into viewer-development 2011-03-01 12:02:14 -08:00
Merov Linden 760f6f494e STORM-949 : pull into viewer-development 2011-03-01 11:59:46 -08:00
Merov Linden 0a974abcff STORM-889 : pull into viewer-development 2011-03-01 11:58:12 -08:00
Merov Linden 270f3afad4 STORM-842 : pull into viewer-development 2011-03-01 11:56:21 -08:00
Merov Linden 05546dfa3b STORM-665 : pull into viewer-development 2011-03-01 11:55:08 -08:00
Merov Linden 4e3068fcd4 STORM-1024 : pull into viewer-development 2011-03-01 11:53:47 -08:00
Merov Linden f86e112556 STORM-977 : pull into viewer-development 2011-03-01 11:50:12 -08:00
Jennifer Leech a14c5e8f31 Added 'env|sort' to build.sh for debugging TC builds. 2011-03-01 11:30:47 -08:00
Jennifer Leech a7e2f1eafd 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. 2011-02-28 23:47:48 -08:00
Merov Linden 9962560f57 STORM-980 : pull into viewer-development 2011-02-25 15:44:38 -08:00
Merov Linden 8976c93b5c STORM-974 : pull into viewer-development 2011-02-25 15:42:07 -08:00
Merov Linden 12f4e55fc0 STORM-680 : pull into viewer-development 2011-02-25 15:40:32 -08:00
Merov Linden b9c6c9d273 STORM-979 : pull into viewer-development 2011-02-25 15:39:01 -08:00
Merov Linden 0a397313f5 Fix llhost integration test: replaced linux.org by lindenlab.com in the DNS lookup test as linux.org was not being resolved as expected 2011-02-25 15:32:58 -08:00
Jennifer Leech d9a47b3395 s/build-vc80/build-vc100/ 2011-02-25 14:48:13 -08:00
Jennifer Leech 7aca14a77a Automated merge with https://bitbucket.org/jenn_linden/viewer-vs2010 2011-02-24 16:07:20 -08:00
Jennifer Leech 713933fa76 Merged changes from bitbucket.org/squire_linden/viewer-vs2010 2011-02-24 15:59:52 -08:00
Alain Linden 2c27d43228 update to fixed debug google-mock archive. 2011-02-24 15:43:50 -08:00
Merov Linden d8944cfef3 Windows uses updated fmod archive and vs2010 compiled kdu archive. 2011-02-24 14:07:03 -08:00
Alain Linden 1db3f3b5ce integrate xmlrpc-epi into windows build. 2011-02-24 12:27:58 -08:00
Paul ProductEngine c3ae164328 STOMR-665 FIXED User is not able to view full name of Group's founder in the Group Profile 
- Made text box and its panel follow right
 2011-02-24 16:27:12 +02:00
Alain Linden f939b95d0c update windows to use new libndofdev and google-mock archives. 2011-02-23 15:50:03 -08:00
Xiaohong Bao 609c70eb5a separate vertex buffer and index buffer when map/unmap VBO. can be treated as part of STORM-1011. 
reviewed by davep.
 2011-02-23 11:41:13 -07:00
Alain Linden 62feb3b4bc windows uses updated ogg-vorbis archive. 2011-02-22 14:54:28 -08:00