summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2011-06-23FIX VWR-25125eli_linden
2011-06-23merge viewer-development to mesh-developmentBrad Payne (Vir 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-22Automated merge with http://hg.secondlife.com/mesh-developmentXiaohong Bao
2011-06-22mergeDave Parks
2011-06-22SH-1848 Integrate changeset to fix typo in shader name preventing shadows ↵Dave Parks
being enabled while anti-aliasing is on on platforms where filenames are case sensitive.
2011-06-22SH-1815 Fix for crash when using old version slmDave Parks
2011-06-22mergeprep
2011-06-22WIP SH-1791 - constructAndAddReturnable() now accepts target regionprep
2011-06-22SH-989 FIX - only reject LOD if vertex total is too high, rather than ↵Brad Payne (Vir Linden)
checking mesh-by-mesh. This should make rejections much less common.
2011-06-22mergeBrad Payne (Vir Linden)
2011-06-22WIP for SH-1791prep linden
2011-06-22mergeBrad Payne (Vir Linden)
2011-06-22Automated merge with http://hg.secondlife.com/mesh-developmentXiaohong Bao
2011-06-22SH-1725 WIP Floater upload model wizard update:Seth ProductEngine
- XUI changed according to latest mockups - Added switching to advanced upload floater - Added "Recalculate geometry" and "Recalculate physics" buttons
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-21Automated merge with ↵Xiaohong Bao
https://bitbucket.org/VirLinden/viewer-development-shining-fixes
2011-06-21fix for SH-1642: [PUBLIC_JIRA_USERS][crashhunters] crash at ↵Xiaohong Bao
LLViewerTextureList::removeImageFromList(LLViewerFetchedTexture *) [secondlife-bin llviewertexturelist.cpp]
2011-06-21fix for SH-369: [PUBLIC-JIRA-USERS] [crashhunters] ↵Xiaohong Bao
LLVOAvatar::updateImpostors crash
2011-06-21FIX VWR-25118eli_linden
2011-06-21Fix for memory leak & extra inventory observers in ↵Don Kjer
start_new_inventory_observer. Reviewed by Richard
2011-06-21SH-1838 Fix for black screen when enabling lighting and shadows on an ATI ↵Dave Parks
machine.
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-21debug code for SH-692: Viewer Crash when enabling Render Metadata > Physics ↵Xiaohong Bao
Shapes on Mesh Sandbox 25 on Windows XP
2011-06-21SH-1719 FIXED Viewer side cleanup of presentation of accounting data in ↵Paul ProductEngine
build tools - Moved grid mode combo box to the grid options floater - Updated UI of the build floater according to the spec - Fixed "conflict" between LLFloaterOpenHandler and LLFloaterHandler command handlers
2011-06-21SH-208 Disable VBO on all intel graphics chips (stability improvement).Dave Parks
2011-06-21Fix EXP-825: check for null gAgentAvatarp to prevent crash (hopefully).Andrew A. de Laix
2011-06-20mergeDave Parks
2011-06-20SH-1880 partial fix for crashing on daes without UVs.Dave Parks
2011-06-20SH-1618 isFullbright causes AvatarEyes GL shader to fail to link.Aaron Stone
2011-06-20Automated merge with http://hg.secondlife.com/viewer-developmentAndrew A. de Laix
2011-06-21STORM-1352 WIP Issue a warning if a NULL chat toast is encountered.Vadim ProductEngine
2011-06-20Automated merge with https://hg.secondlife.com/mesh-developmentNyx (Neal Orman)
2011-06-20BUILDFIX: linux build broken - abs() used instead of fabs()Nyx (Neal Orman)
linux caught the fact that we're using an integer absolute value function when we should be using a floating-point version.
2011-06-20Automated merge with http://hg.secondlife.com/mesh-developmentXiaohong Bao
2011-06-20fix for SH-1870: can not upload book_collection_1.dae when include texturesXiaohong Bao
2011-06-20CHOP-662 Coupl of fixes to extended unit-testSquire
2011-06-20sync with viewer-developmenteli_linden