summaryrefslogtreecommitdiff
path: root/indra/newview
AgeCommit message (Collapse)Author
2011-06-27ER-910: Parcel privacy. Got new icons, cleaned up xml linkage a bit.simon@lindenlab.com
2011-06-21Merge with latest lindenlab/viewer-developmentsimon@lindenlab.com
2011-06-20ER-944: Add feature to control user sounds on a parcel. Added new checkboxessimon@lindenlab.com
to the About Land / Sound tab. Reviewed by Kelly.
2011-06-20SH-1618 isFullbright causes AvatarEyes GL shader to fail to link.Aaron Stone
2011-06-20mergeDave Parks
2011-06-17fix DOS line endingsOz Linden
2011-06-17merge mesh branch changes (storm-1390)Oz Linden
2011-06-17storm-1389Oz Linden
2011-06-17FIX VWR-25070eli_linden
2011-06-17FIX VWR-25068 en_xui_changeeli_linden
2011-06-17WIP INTL-46 Traditional Chinese translation update 6/17eli_linden
2011-06-16fix for STORM-1274: crash at LLVOCacheEntry::~LLVOCacheEntry() line 138Xiaohong Bao
2011-06-16mergeBrad Payne (Vir Linden)
2011-06-16Fix for linux build failure, hopefullyBrad Payne (Vir Linden)
2011-06-16Merge with latest lindenlab/viewer-developmentsimon@lindenlab.com
2011-06-16mergeBrad Payne (Vir Linden)
2011-06-16SH-1166 FIXBrad Payne (Vir Linden)
2011-06-16sync with viewer-developmenteli_linden
2011-06-16mergeprep linden
2011-06-16Fix for camera wonkiness (sh-1654 ...)prep linden
2011-06-15SH-1166 WIPBrad Payne (Vir Linden)
2011-06-15Automated merge with http://hg.secondlife.com/mesh-developmentXiaohong Bao
2011-06-15fix for SH-1788: Assert in texture load when uploading textured mesh modelXiaohong Bao
and beyond: fixed the thread-safe and highest texture resolution flaws in the mesh texture uploading flow.
2011-06-15mergeBrad Payne (Vir Linden)
2011-06-15SH-1773 FIXBrad Payne (Vir Linden)
2011-06-15storm-1347Oz Linden
2011-06-15FIX INTL-50 DE translation for Set24 and Basic Set3eli_linden
2011-06-15Fix for sh-1771 and also fixed a bug with a never ending load (with eventual ↵prep linden
crash) bug when a visual scene is missing.
2011-06-15merge changes for storm-1298Oz Linden
2011-06-15merge changes for storm-1339Oz Linden
2011-06-15merge changes for storm-1103Oz Linden
2011-06-15merge changes for storm-1313Oz Linden
2011-06-15merge changes for storm-787Oz Linden
2011-06-15merge changes for storm-899Oz Linden
2011-06-15merge changes for storm-1273Oz Linden
2011-06-15STORM-1339 FIXED Making a preventive fix for a crash in ↵Vadim ProductEngine
LLPanelPlaces::onTeleportButtonClicked().
2011-06-14mergeDave Parks
2011-06-14SH-680 Adjust streaming cost scaler to agree with simulator.Dave Parks
2011-06-14merge changes for storm-1342Oz Linden
2011-06-14WIP CT-648 DA translation for Set24, Basic Set3eli_linden
2011-06-14FIX CT-641 DA translation for Set23eli_linden
2011-06-14FIX CT-637 DA translation for Basic Set2eli_linden
2011-06-14merge changes for storm-1338Oz Linden
2011-06-14WIP INTL-46 Traditional Chinese translation updateeli_linden
2011-06-14Enabling watchdog timer with timeout of 20.jenn
This is in support of a Viewer crash pile-on. It is intended to ship to Beta, then either be reverted or have an increased timeout prior to shipping to release.
2011-06-14mergeBrad Payne (Vir Linden)
2011-06-13SH-1796 FIXBrad Payne (Vir Linden)
2011-06-13STORM-787 Mute Gestures Button--moved check box down 2 linesJonathan Yap
2011-06-13FIX VWR-25984eli_linden
2011-06-13FIX CT-636 CT-640 DA translation for Set22 and Set1eli_linden