summaryrefslogtreecommitdiff
path: root/indra/newview
AgeCommit message (Collapse)Author
2011-06-28Merged in viewer-development changesSquire
2011-06-28STORM-1423 (aka VOICE-3) merged fromSquire
roxie_linden/viewer-developement
2011-06-28STORM-1372, STORM-1439Squire
Merged in: alain_linden/viewer-development lindenlab/viewer-development
2011-06-28STORM-1334: compute area using integer math to avoid type conflictOz Linden
2011-06-28merge changes for storm-1103Oz Linden
2011-06-28merge changes for storm-323Oz Linden
2011-06-28merge changes for vwr-25480Oz Linden
2011-06-28merge changes for storm-1393Oz Linden
2011-06-28merge changes for storm-1334Oz Linden
2011-06-27storm-1444: Disable mesh loadingNyx (Neal Orman)
2011-06-26STORM-1103 sets a minimum size for map in nearby people and makes the map ↵Twisted_Laws
resizable
2011-06-26merge changes for storm-1443Oz Linden
2011-06-24automated mergeRoxie Linden
2011-06-24sync with viewer-developmenteli_linden
2011-06-23FIX VWR-25660 en_xui_changeeli_linden
2011-06-23FIX VWR-25408eli_linden
2011-06-23FIX VWR-25400eli_linden
2011-06-23FIX VWR-25381eli_linden
2011-06-23FIX VWR-25125eli_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-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-21Fix EXP-825: check for null gAgentAvatarp to prevent crash (hopefully).Andrew A. de Laix
2011-06-20Automated merge with http://hg.secondlife.com/viewer-developmentAndrew A. de Laix
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-20STORM-1393 : Correction for loss of object/prim counts in the Build floater forWolfpup Lowenhar
non-mesh objects.
2011-06-20SH-1618 isFullbright causes AvatarEyes GL shader to fail to link.Aaron Stone
2011-06-20mergeDave Parks
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-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
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-08 21:32:23 +0000