summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2011-06-24automated mergeRoxie Linden
2011-06-23automated mergeRoxie Linden
2011-06-23Fix for VOICE-3 [crashhunters] LLVoiceVoiceClient::stateMachineRoxie Linden
Race condition with parcel changing while shutting down. If a parcel changes, we went into code that requests the cap for the new parcel voice channel info. This happened in any state, not the two states where it is really appropriate. stateRunning or stateNoSession. When shutting down, we may be in stateTerminate, stateLeavingSession, or so on, and we don't want to muck with getting caps and such during that time.
2011-06-23merge changes for storm-899Oz Linden
2011-06-23merge changes for storm-1437Oz Linden
2011-06-22merge changes for storm-1421Oz Linden
2011-06-22STORM-899 [ILL-FORMED XML] 'No attachments worn' text on blank 'Attachments' ↵Jonathan Yap
accordion remains in English for all locales Added / to xml file
2011-06-21CHOP-662 Merged into viewer-development-crash-hordeSquire
2011-06-21STORM-1368 Merge with veiewer-development-crash-hordeSquire
2011-06-21Pulled from viewer developmentSquire
2011-06-21CHOP-662 cleanup in response to code review.Squire
2011-06-21FIX VWR-25160 en_xui_changeeli_linden
2011-06-21FIX VWR-25159eli_linden
2011-06-21FIX VWR-25118eli_linden
2011-06-21pull late release change back from viewer-pre-releaseOz Linden
2011-06-21FIX VWR-25072eli_linden
2011-06-21FIX VWR-25071eli_linden
2011-06-20CHOP-662 Coupl of fixes to extended unit-testSquire
2011-06-20sync with viewer-developmenteli_linden
2011-06-20Chop-662 - fixes to deal with cleanly moving between the glob and regex worldSquire
2011-06-20Added more tests to cover the common examples in the crash logsSquire
2011-06-20increment viewer version to 2.7.5Oz Linden
2011-06-20SH-1618 isFullbright causes AvatarEyes GL shader to fail to link.Aaron Stone
2011-06-20SH-1618 Fix for shaders being disabled on mac due to switch statement in ↵Dave Parks
indexed texture rendering code.
2011-06-20mergeDave Parks
2011-06-17CHOP-662 Added booost library to unittest for lldiriterator.cppSquire
2011-06-17STORM-1368 Code more defensively around notecard upload.Aaron Stone
2011-06-17fix DOS line endingsOz Linden
2011-06-17merge mesh branch changes (storm-1390)Oz Linden
2011-06-17storm-1389Oz Linden
2011-06-17COP-662 Added newline at end of file for Linux buildSquire
2011-06-17Automated merge with ssh://hg@bitbucket.org/lindenlab/viewer-pre-releaseOz Linden
2011-06-17Merge in viewer-developmentSquire
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-17CHOP-662 - initial fix to problems with regex characters in Group namesSquire
causing the LLDirIterator to crash the viewer when opening chat logs
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-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)