phoenix-firestorm/indra
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
..
cmake Merged into release with command: 2008-11-07 00:07:44 +00:00
copy_win_scripts
lib/python Merged into release with command: 2008-11-07 00:07:44 +00:00
linux_crash_logger
llaudio
llcharacter
llcommon Merge 98702-99587 viewer_1-21 -> release Merging changes made between 1.21 RC5 secu-fix to 1.21.6 release. 2008-10-20 22:16:40 +00:00
llcrashlogger
llimage
llimagej2coj
llinventory
llmath svn merge -r96886:98039 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-24-Server --> release 2008-10-01 00:42:47 +00:00
llmessage DEV-22360 - Interim fix for VWR-9784: Unable to upload scripts - this will be replaced later with final code, but we need to unblock release 2008-10-17 17:48:05 +00:00
llprimitive 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
llrender
llui Merge 98702-99587 viewer_1-21 -> release Merging changes made between 1.21 RC5 secu-fix to 1.21.6 release. 2008-10-20 22:16:40 +00:00
llvfs 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
llwindow Fix nasty printf argument error 2008-10-31 18:47:46 +00:00
llxml
lscript Fix more silly printf crasher holes 2008-10-31 18:51:42 +00:00
mac_crash_logger Merged into release with command: 2008-11-07 00:07:44 +00:00
mac_updater Merged into release with command: 2008-11-07 00:07:44 +00:00
newview Fix to cmake darwin package target needed for cmake 2.6.2 2008-11-05 00:51:39 +00:00
test Merged into release with command: 2008-11-07 00:07:44 +00:00
tools/vstool
win_crash_logger
win_updater svn merge -r100302:100467 installer-james-combo-merge for QAR-972, incorporating: 2008-10-28 23:56:20 +00:00
CMakeLists.txt Merged into release with command: 2008-11-07 00:07:44 +00:00
develop.py Fix heinous traceback if commands are not found 2008-10-31 18:23:00 +00:00