Commit Graph

14472 Commits (44bfcd662bf1bca7d4d60df393f66bd2c165db5a)

Author SHA1 Message Date
jenn 44bfcd662b Automated merge with https://bitbucket.org/mani_linden/viewer-autobuild 2011-01-18 10:00:01 -08:00
jenn 3150fb0021 Added entries to autobuild.xml for 'openal_soft' and 'google' libs on linux.
These packages have been rebuilt to use the new package layout (thanks alain!).
'openal_soft' was also renamed to use an underscore in its name rather than a dash.
2011-01-18 09:59:34 -08:00
Andrew A. de Laix b82c6af32a first crack at getting TC build to work, cross your fingers... 2011-01-14 15:39:37 -08:00
Andrew A. de Laix e4392e6ae9 bye bye install.py... 2011-01-14 15:38:30 -08:00
Alain Linden 738c754608 windows autobuildibatized (bye bye install.py...) 2011-01-14 09:03:22 -08:00
Andrew A. de Laix b7637e58be mac buiding with autobuild and autobuild style packages (just say no to install.py) 2011-01-13 13:09:27 -08:00
Andrew A. de Laix 5d3e7c8e7e add licence file information 2011-01-12 11:56:25 -08:00
Andrew A. de Laix 35c259b603 first pass at packages that need to be installed through autobuild. 2011-01-12 09:28:21 -08:00
Andrew A. de Laix 2230b52145 remove develop.py and references to it (use autobuild instead) 2011-01-11 16:07:14 -08:00
Andrew A. de Laix fabcf9c8e0 autobuild configuration to build the viewer (dependencies still handled by install.py) 2011-01-11 15:59:22 -08:00
Merov Linden aab5759467 STORM-807 : pull into viewer-development 2011-01-11 09:03:18 -08:00
Merov Linden c8457f2664 STORM-807 : Clean up code as discussed with Andrew 2011-01-10 18:01:16 -08:00
Merov Linden 8e3c9b1273 pull from viewer-beta 2011-01-10 15:10:11 -08:00
callum c3fe256ef3 SOCIAL-437 FIX Viewer crashes opening My Profile panel 2011-01-10 10:32:36 -08:00
Andrew Meadows 1b7bd5e2d0 merge 2011-01-07 15:22:33 -08:00
Andrew Meadows d23f7df822 merge 2011-01-07 15:22:22 -08:00
Andrew Meadows cf64ecb41d Adding group owned check for enabling returnability of objects on parcels. 2011-01-07 15:20:11 -08:00
Oz Linden 964e981458 merge changes for vwr-1095 2011-01-07 16:45:04 -05:00
Oz Linden 8a939212f4 merge changes for storm-826 2011-01-07 16:44:38 -05:00
Coaldust Numbers 8cfea0bab1 VWR-1095 fix for problems with uploads following bulk upload failure
de minimus contribution accepted without CA - Oz Linden
2011-01-07 15:08:42 -05:00
Oz Linden c132d20a74 increment minor revision number to make version "2.6.0" 2011-01-07 12:46:55 -05:00
Oz Linden 4d08333dce Added tag 2.5.0-start for changeset a82e5b1e22c7 2011-01-07 12:37:00 -05:00
Oz Linden 346082965a STORM-826: fix line endings and mixed tabs/spaces 2011-01-07 11:26:16 -05:00
Oz Linden e1e38c4cee merge changes for storm-34 2011-01-07 10:39:05 -05:00
Oz Linden 09c01c4e92 Automated merge with file:///Users/oz/Work/V-D 2011-01-06 21:38:05 -05:00
Oz Linden 9833f43664 merge changes for web profiles 2011-01-06 19:20:54 -05:00
callum cf8a16366a SOCIAL-423 FIX Display name and username are wrong in My Profile tab 2011-01-06 13:41:04 -08:00
Brad Payne (Vir Linden) 8d2c4369da Validation check for edit classified and edit pick slapps 2011-01-06 16:31:27 -05:00
David Kaprielian 3f6fe6912a Syncing coverity build.sh code with trunk. 2011-01-06 13:08:00 -08:00
Oz Linden 894e98a708 merge changes for storm-812 2011-01-06 14:33:35 -05:00
Oz Linden 94fbf99ac2 merge changes for storm-714 2011-01-06 14:32:01 -05:00
Oz Linden a9686db3e6 merge changes for storm-438 2011-01-06 14:31:17 -05:00
callum 9ece5ed510 Merge from viewer-development before merge to viewer-development request submitted 2011-01-06 10:59:41 -08:00
Oz Linden a4d5e38535 STORM-826 (workaround): correct mixed and dos-style line endings 2011-01-06 11:06:20 -05:00
callum b9ca6c553c Merge with viewer-development 2011-01-05 15:52:43 -08:00
callum ed3ea14984 SOCIAL-304 FIX Modify side panel to reflect Profiles changes 2011-01-05 15:49:57 -08:00
Oz Linden 1034db6394 merge changes for storm-806 2011-01-05 17:54:12 -05:00
Oz Linden eb0b8ab3ea merge changes for storm-825 2011-01-05 17:53:37 -05:00
Loren Shih d5a0c56bf5 SH-716 FIXED Water reflections should not default to ON for High graphics setting
Revert to previous behavior.  Reflections stay at "minimal".
2011-01-05 17:00:07 -05:00
Loren Shih c3501a4f23 Automated merge from viewer-development 2011-01-05 16:35:09 -05:00
Loren Shih 3b1a06b024 SH-716 FIXED Water reflections should not default to ON for High graphics setting
Revert to previous behavior.  Reflections stay at "minimal".
2011-01-05 16:31:29 -05:00
Oz Linden e2f197b6f7 merge changes for storm-398 2011-01-04 16:46:09 -05:00
Oz Linden 78895f9e0c merge changes for storm-467 2011-01-04 16:45:08 -05:00
Oz Linden 562ed9c4d4 merge changes for storm-485 2011-01-04 16:44:15 -05:00
Oz Linden 05810f063d merge changes for storm-737 2011-01-04 16:43:26 -05:00
Oz Linden e4591a8518 merge changes for storm-466 2011-01-04 16:41:05 -05:00
Oz Linden 67ced403e6 merge changes for storm-513 2011-01-04 16:40:25 -05:00
Oz Linden 7a2f0ba9a8 merge changes for storm-493 2011-01-04 16:39:53 -05:00
Oz Linden 69b6aa5db2 merge changes for storm-669 2011-01-04 16:37:59 -05:00
Oz Linden 12bc7eb017 merge changes for storm-823 2011-01-04 16:37:16 -05:00