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

10 Commits (9818f158366a0df980a2e4b9251177d9a9209cfb)

Author SHA1 Message Date
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
Brad Kittenbrink abdc99f21b Merge of QAR-1267 to trunk. This was a combo merge of QAR-1175 (maint-render-9) and QAR-1236 (dll-msvcrt-2) 
svn merge -r 109838:112264 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-render/maint-render-9-merge-r109833
 2009-02-18 21:10:16 +00:00
Kyle Ambroff a889511851 Don't link the simulator with iconv.dll on Windows. 2008-12-05 23:07:19 +00:00
Kyle Ambroff 992d2867ae indra/cmake/APR.cmake: Fix windows simulator build so it still dymanically links with iconv. 2008-12-05 17:45:21 +00:00
Kartic Krishnamurthy 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
Bryan O'Sullivan fa11307d61 QAR-842 / Port Mac build borkage fix to release 2008-09-02 20:54:30 +00:00
Kyle McKay 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
Jennifer Leech 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
Steven Bennetts 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
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