ac68eb16a2
Merging the changes in viewer_1-22-0 (1.22 RC0) back into trunk, revs. 101837 to 103519
2008-11-21 01:18:39 +00:00
2a44e81675
QAR-1018 Lightweight Windows Setup App (windows-setup-3). svn merge -r102882:102883 svn+ssh://svn.lindenlab.com/svn/linden/branches/windows-setup/windows-setup-3-merge
2008-11-19 23:26:29 +00:00
a879e13055
svn merge -c102054
...
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/morejoy-2-r102015
QAR-1016 joystick+spacenav improvements MERGE
2008-11-12 20:28:24 +00:00
b2bfb128e7
Merged into release with command:
...
=================================
svn merge -r100865:101402 svn+ssh://svn/svn/linden/branches/purge-dpo-code-for-merge .
QAR-951 : Sandbox QA for DEV 20842 - Ensure DPO is not enabled accidentally
QAR-967 : Merge Build for DEV 20842 - Ensure DPOis not enabled accidentally
QA tested: Beast, Oskar
DEV's fulfilled as part of this branch:
======================================
DEV-20842 Prevent accidental activation of DPO procs
DEV-23028 Mac build fails - link error dual inclusion
DEV-20824 VWR-9255: Build fails on mac_updater and mac_crash_logger targets due to info.plist problems
DEV-22997 Xcode project: 'server' target has no dependencies
DEV-23353 Friend request custom messages come through as an asset tag.
DEV-23309 Voice Chat Indicator does not show active voice status
DEV-23187 Can't teleport to home location
2008-11-07 00:07:44 +00:00
1f3e44d0e6
Added search path for Microsoft DirectX SDK (August 2008), the latest version. OK by Ambroff.
2008-10-29 07:01:11 +00:00
7a9360c8bc
Allow use of Python 2.6, in case it's useful for OSS builds.
2008-10-28 23:18:16 +00:00
5f3875018e
svn merge -r99056:99248 svn+ssh://svn.lindenlab.com/svn/linden/branches/andrew/gcc-4-003-for-merge
2008-10-10 16:04:02 +00:00
4ff16b735f
QAR-907: svn merge -r 98908:98910 svn+ssh://svn/svn/linden/qa/sim-metrics/sim-metrics2-release-merge-98903 into release
2008-10-09 18:07:46 +00:00
13c96cc47b
DEV-19146 / Don't hard-code Windows paths.
2008-09-24 00:07:45 +00:00
afe61eb994
QAR-849 merge maint-viewer-10-merge 96838-97237 -> release
2008-09-23 01:53:11 +00:00
8ba757aab2
Fix dataserver build on OS X.
2008-09-05 23:05:13 +00:00
fa11307d61
QAR-842 / Port Mac build borkage fix to release
2008-09-02 20:54:30 +00:00
818535576c
Switch more libraries over to target_link_libraries
2008-08-29 22:16:44 +00:00
1496c3d0ee
Switch llimage and llxml to target_link_libraries
2008-08-29 21:46:30 +00:00
eb65aca9f8
Use target_link_libraries for llaudio
2008-08-29 21:26:27 +00:00
8279f93f4d
Use target_link_libraries for llcommon
2008-08-29 21:18:49 +00:00
4a6bacea0f
merge viewer/viewer_1-21 94170-94770 -> release
...
merge viewer/viewer_1-21-0 94830-95157 -> release
Includes:
QAR-786 Sandbox buildme for viewer + server Release Notes on the wiki!
QAR-797 teleport failures (DEV-6198 / SVC-972) mergeme
2008-08-28 23:57:41 +00:00
728e2c6e70
fix for DEV-18488 - remove optimization for RelWithDebInfo for Darwin builds. Not reviewed, mailed to cmake@. Pretty minor, not destructive. Also removing test lldatabase_tut on mac for DEV-14371 until theres a sane way to do connection checking. I could be wrong on this one.
2008-08-18 08:09:52 +00:00
80be4c1d2d
QAR-767 Combined maint-render-7 and maint-viewer-9 merge
...
merge release@93398 viewer-merge-1@94007 -> release
dataserver-is-deprecated
2008-08-12 17:29:50 +00:00
943db8fc6b
Added the latest directx sdk release (June 2008) to the list that cmake searches for.
...
-Reviewed by bos
2008-08-08 22:14:53 +00:00
b82b614d3c
DEV-18513: Simplify use of Boost libraries on OS X.
...
Self-reviewed.
2008-07-31 20:53:33 +00:00
c945c6eba8
If we need Mono, but don't find it, then fail early
...
Self-reviewed.
2008-07-31 17:45:03 +00:00
76a08a7884
DEV-18513 - Don't fail if we have no debug FMOD libraries
...
Reviewed by Poppy.
2008-07-31 17:21:46 +00:00
9a7d68cfce
svn merge -r93014:93396 svn+ssh://svn.lindenlab.com/svn/linden/branches/mono-r93014-qar633 dataserver-is-deprecated
2008-07-31 12:15:15 +00:00
f2c327be96
Remainder of CMake 2.6.0 compatibility fixes. CMake 2.4.7/2.4.8 or 2.6.0 can now be used for Mac builds.
2008-07-26 22:56:53 +00:00
1bb86fb755
CMake updates:
...
1. Initial compatibility with CMake 2.6 (verified on Mac OS X, other platforms may need more work)
2. Ability to more easily debug problems fetching prebuilt libraries (./develop.py configure -DDEBUG_PREBUILT=1)
3. Compatibility with Mac OS X MacPorts/Fink installations by trying to find and use system python executable first
2008-07-26 18:21:31 +00:00
b27e0e08f0
Add code to support add_viewer_version_to_manager
2008-07-15 01:34:41 +00:00
c8eae77636
Check the actual version of the compiler we're going to use to compile the sources to determine which options need to be added rather than the version of some other compiler on the system.
2008-07-10 02:16:54 +00:00
144aeb56ca
Add support for GRID:STRING in cmake
2008-07-07 21:57:50 +00:00
757e8e84f8
Including fontconfig in the viewer build. (Omitted before)
...
Fix for DEV-17484: package-grabber omits fontconfig
2008-07-03 21:48:30 +00:00
1d12a5c20a
DEV-17460 updated the cmake SERVER variable init to work reliably
2008-07-03 21:10:36 +00:00
e6dcb705a5
Fix for windows + develop.py: Use pscp on windows instead of scp.
...
This also requires a putty session to be created, same as we do for svn.
2008-07-03 18:15:16 +00:00
1a954d38cd
Removing status msg: "Could not find scp or pscp executable" for case when scp not on system. Clutters output, and is not really necessary.
2008-07-02 19:59:11 +00:00
939a506569
Merging in file-move-merge ( QAR-649 )
...
Result of "svn merge -r 90669:90786 $tulla/file-move-merge ."
Be careful of future merges involving changes to any of these moved files as SVN usually does the wrong thing:
newview/llglslshader.* -> llrender/llglslshader.*, llrender/llshadermgr.*, newview/llviewershadermgr.* (gets split into 3 separate files)
newview/llpostprocess.* -> llrender/llpostprocess.*
newview/llrendersphere.* -> llrender/llrendersphere.*
newview/llcubemap.* -> llrender/llcubemap.*
llwindow/llgl.* -> llrender/llgl.*
llwindow/llglstates.h -> llrender/llglstates.h
llwindow/llgltypes.h -> llrender/llgltypes.h
llwindow/llglheaders.h -> llrender/llglheaders.h
2008-06-30 17:57:00 +00:00
41877d457a
vivox is cleared for open source distribution
...
removing conditional install
reviewed by cg
2008-06-27 17:28:15 +00:00
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
94fb9ee0b8
Update to remove the warnings about WindowsDevLibsCopy.cmake from previous commit (DEV-16646)
2008-06-24 16:51:47 +00:00
889841f4f6
DEV-16646 second-life post build silently fails. Instead of post build, there's a new target - copy-win-libs. Removed python dependecy from the copy
...
Reviewed by bos
2008-06-24 01:30:55 +00:00
dc3f5ff87c
svn merge -r90150:90340 svn+ssh://svn.lindenlab.com/svn/linden/branches/qar-699_combo-merge --> release
...
QAR-699 - Combo merge for QAR-687, QAR-637, QAR-586
* QAR-687 - Test build with libs on S3
* QAR-637 Test dynamic sound throttle
* QAR-586 Test new http features branch
2008-06-21 07:39:52 +00:00
4e19c91811
whoops - one line, nay, one *word* fix to my mac universal patch. Reviewed by cg
2008-06-17 19:31:12 +00:00
cd21004bda
for "new lib install step is too slow!" problem mailed to cmake@. Reviewed by bos and cg.
2008-06-16 18:51:52 +00:00
916f9af25c
"mac cmake build should not be universal by default" changes. Reviewed by bos.
2008-06-16 09:21:51 +00:00
31565ac441
Fixes the the copy-win-scripts related cmake files to make the copy_win_scripts target function properly.
2008-06-13 16:52:59 +00:00
fbf15572d9
svn merge -r89258:89534 svn+ssh://svn/svn/linden/branches/install-dev-binaries/idb2-merge-buildme
2008-06-12 20:51:41 +00:00
26a87de287
Added another search path for the DirectX SDK (the August 2007 version). At some point we should decide exactly what DirectX SDK versions we support, but today is not that day. And this is not the oldest version on the path list.
2008-06-11 21:04:44 +00:00
ad33281007
QAR-650 - Viewer RC 9 merge -> release (post cmake)
...
merge release@88802 Branch_1-20-Viewer-2-merge-1@89178 -> release
2008-06-06 22:43:38 +00:00
c955963a31
Wave a dead chicken over the mac linker
2008-06-04 20:35:11 +00:00
aaa86b2df3
Fix incorrectly named linker variable
2008-06-04 20:18:45 +00:00
710ce27cb0
Pick up our libraries on Darwin.
2008-06-04 19:40:54 +00:00
df357fe833
FIXED silly mistake.
...
Added another alternate, default location for DirectX SDK files.
Reviewed by Mani
2008-06-02 23:44:07 +00:00
4199f6dd1d
Added another alternate, default location for DirectX SDK files.
...
Reviewed by Mani
2008-06-02 23:32:10 +00:00
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
Mark Palange