| Age | Commit message (Collapse) | Author | 
|---|
|  |  | 
|  |  | 
|  | 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 | 
|  | 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. | 
|  | merge release@93398 viewer-merge-1@94007 -> release
dataserver-is-deprecated | 
|  | searches for.
-Reviewed by bos | 
|  | Self-reviewed. | 
|  | Self-reviewed. | 
|  | Reviewed by Poppy. | 
|  | svn+ssh://svn.lindenlab.com/svn/linden/branches/mono-r93014-qar633 dataserver-is-deprecated | 
|  | can now be used for Mac builds. | 
|  | 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 | 
|  |  | 
|  | sources to determine which options need to be added rather than the version of some other compiler on the system. | 
|  |  | 
|  | Fix for DEV-17484: package-grabber omits fontconfig | 
|  |  | 
|  | This also requires a putty session to be created, same as we do for svn. | 
|  | scp not on system.  Clutters output, and is not really necessary. | 
|  | 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 | 
|  | removing conditional install
reviewed by cg | 
|  | svn+ssh://svn/svn/linden/branches/install-dev-binaries/s3-build -> release | 
|  | commit (DEV-16646) | 
|  | there's a new target - copy-win-libs. Removed python dependecy from the copy
Reviewed by bos | 
|  | 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 | 
|  |  | 
|  | by bos and cg. | 
|  |  | 
|  | copy_win_scripts target function properly. | 
|  | svn+ssh://svn/svn/linden/branches/install-dev-binaries/idb2-merge-buildme | 
|  | 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. | 
|  | merge release@88802 Branch_1-20-Viewer-2-merge-1@89178 -> release | 
|  |  | 
|  |  | 
|  |  | 
|  | Added another alternate, default location for DirectX SDK files.
Reviewed by Mani | 
|  | Reviewed by Mani | 
|  | svn+ssh://svn.lindenlab.com/svn/linden/branches/cmake-9-merge
dataserver-is-deprecated
for-fucks-sake-whats-with-these-commit-markers |