summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerparcelmedia.cpp
diff options
context:
space:
mode:
authorKartic Krishnamurthy <drunkensufi@lindenlab.com>2008-11-07 00:07:44 +0000
committerKartic Krishnamurthy <drunkensufi@lindenlab.com>2008-11-07 00:07:44 +0000
commitb2bfb128e7d30e1cdb293a2ac192a0cbe63fe528 (patch)
tree29fbacff21395f53f5b029796f90a34638118fe9 /indra/newview/llviewerparcelmedia.cpp
parent24ff4831f2a24045b3d06e81581dbe6d20475722 (diff)
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
Diffstat (limited to 'indra/newview/llviewerparcelmedia.cpp')
0 files changed, 0 insertions, 0 deletions