Commit Graph

27 Commits (8485bff29b98f47954b78b31b2e0511f94de3be4)

Author SHA1 Message Date
Jessica 2cc50e9684 Credits for Upload-to-Flickr commit: Original code from Katharine Berry, perm to license LGPL given. Patch contributed by Alexie Birman FIRE-589
Turtoise HG auto commited this under Alexie's name, however it was commited to the repo by myself.
2011-04-16 12:26:23 -04:00
Jessica d7cbb706dc Changed flickr api key to Phoenix-Firestorm API 2011-04-16 12:12:32 -04:00
Alexie Birman 882c80b778 Upload-to-Flickr 2011-04-10 15:23:44 +01:00
Kadah 7a68e8ff11 Turn off LL_TESTS by default 2011-01-08 00:40:21 -08:00
Arrehn aeaf4c5651 Updated macosx build control for channels 2010-11-13 13:46:32 -05:00
Arrehn 829b22b1e4 Merge from LL 2010-11-05 12:17:05 -07:00
Dave Parks 90c2c4a9bc SH-392 Port over fix from mesh-development for FBOs on OSX 2010-10-27 16:19:18 -05:00
Arrehn f66c9b183b branding (win) 2010-10-23 12:49:10 -04:00
Arrehn 348d15f836 Phoenix branding, part 1, macintosh build 2010-10-19 23:31:37 -04:00
Boroondas Gupte bd3d9e1ba9 VWR-20911 FOLLOWUP fixed indentation (cmake files use spaces only)
(transplanted from d02b22278d5b0a0386b3a7c25221b2069bc02963)
2010-08-31 14:41:46 +02:00
Boroondas Gupte (patch by Robin Cornelius) 136858bd20 VWR-20911 FIXED CMake build arch detection is inaccurate and incomplete
Robin Cornelius' patch from
http://jira.secondlife.com/secure/attachment/42801/SNOW-776+Don%27t+use+uname+for+build+arch+detection%2C+use+compiler.patch
applied without fuzz:

	patching file indra/cmake/Variables.cmake
	Hunk #1 succeeded at 52 (offset -2 lines).

Added entry in doc/contributions.txt.
No further changes other than that.
(transplanted from a9132a63e4739965d65ddd58a7be9eabe4321c2a)
2010-08-31 12:16:03 +02:00
Aimee Linden 437d23710f EXT-7004 : Select GCC 4.0 automatically as the compiler in Xcode with Cmake 2.8.1
GCC 4.0 will be selected as the compiler in Xcode if building against the OS X 10.4 SDK which is incompatible with GCC 4.2

Also made it possible to override the selected SDK from the configure line, by using something like:
-DCMAKE_OSX_DEPLOYMENT_TARGET:STRING='10.4' -DCMAKE_OSX_SYSROOT:PATH='/Developer/SDKs/MacOSX10.5.sdk'

Reviewed by: Poppy.
2010-04-22 16:09:54 +01:00
brad kittenbrink 67f11add9c Added a USE_PRECOMPILED_HEADER cmake variable (defaulted on) and disabled pch usage for test executables. Reviewed by james and steve. 2009-11-13 20:30:54 -05:00
James Cook 3858992603 Add CMake var LL_TESTS to optionally disable tests for build timing 2009-11-27 22:24:57 -08:00
Steven Bennetts 9ec432034d merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3
ignore-dead-branch
2009-06-21 08:04:56 +00:00
Bryan O'Sullivan af91e85531 Small braino 2009-06-02 17:25:54 +00:00
Christian Goetze 4bcbf33422 svn merge -r118008:118374 svn+ssh://svn.lindenlab.com/svn/linden/branches/cg/viewer-etch-1
QAR-1459 etch builds enabled
2009-04-30 06:52:38 +00:00
Christian Goetze 664f27380c merge -r116796:116932 svn+ssh://svn.lindenlab.com/svn/linden/branches/http-texture/http-texture-10
DEV-8668 (llkdu) DEV-30348 (set development default channel to LindenDeveloper)
2009-04-13 21:03:44 +00:00
Christian Goetze c7c34d9ad2 Working around DEV-30401 by yanking the etch 32bit build code until the viewer also builds on etch 2009-04-10 01:14:30 +00:00
Bryan O'Sullivan 1aca3ff6f5 Get 32-bit builds going on 64-bit Debian Etch.
Reviewed by Brad.
2009-04-09 18:05:56 +00:00
Christian Goetze b27e0e08f0 Add code to support add_viewer_version_to_manager 2008-07-15 01:34:41 +00:00
Christian Goetze 144aeb56ca Add support for GRID:STRING in cmake 2008-07-07 21:57:50 +00:00
Mark Palange 1d12a5c20a DEV-17460 updated the cmake SERVER variable init to work reliably 2008-07-03 21:10:36 +00:00
Jennifer Leech d32c8825b6 svn merge -r89701:90677 svn+ssh://svn/svn/linden/branches/install-dev-binaries/s3-build -> release 2008-06-26 19:08:51 +00:00
Paul Oppenheim 4e19c91811 whoops - one line, nay, one *word* fix to my mac universal patch. Reviewed by cg 2008-06-17 19:31:12 +00:00
Paul Oppenheim 916f9af25c "mac cmake build should not be universal by default" changes. Reviewed by bos. 2008-06-16 09:21:51 +00:00
Bryan O'Sullivan 9db949eec3 svn merge -r88066:88786 svn+ssh://svn.lindenlab.com/svn/linden/branches/cmake-9-merge
dataserver-is-deprecated
for-fucks-sake-whats-with-these-commit-markers
2008-06-02 21:14:31 +00:00