summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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-23Log enriched memory info for Mac too.Nat Goodspeed
Add Mac logic to LLMemoryInfo::stream(): run vm_stat and log its output. Add comments with Mac and Linux suggestions to LLMemoryInfo::getAvailableMemoryKB(), responding to comment: //do not know how to collect available memory info for other systems.
2011-06-23merge changes for storm-899Oz Linden
2011-06-23merge changes for storm-1437Oz Linden
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-22merge another batch of changes from windlight integration repoOz Linden
2011-06-22STORM-1305 WIP UI changes in the Edit Water Preset floater.Vadim ProductEngine
- Made the floater smaller. - Removed the "Control Help" label. - Removed the view border, added a horizontal separator. - Fixed the color swatch to only handle mouse within the color box.
2011-06-22STORM-1305 WIP Fixed texture control to not display hand cursor outside of ↵Vadim ProductEngine
the texture. Also click outside of the texture will not show the picker anymore.
2011-06-22correct linux compilation problem in lldrawpoolwlskyOz Linden
2011-06-22merge latest viewer-developmentOz Linden
2011-06-22remove error from build logs by taking out obsolete param (cg said this was ↵Oz Linden
ok to do)
2011-06-22update codeticket configuration for my review buildsOz Linden
2011-06-22STORM-1305 WIP UI changes in the Day Cycle Editor.Vadim ProductEngine
- Made the floater smaller. - Removed the "Control Help" label. - Removed the view border, added a horizontal separator. - Added missing vertical line above the rightmost "12 am" label.
2011-06-22remove a bunch of builds that are no longer neededOz 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-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-21SH-1838 Fix for black screen when enabling lighting and shadows on an ATI ↵Dave Parks
machine.
2011-06-21merged back tags and late changes from viewer-pre-betaOz Linden
2011-06-21pull late release change back from viewer-pre-releaseOz Linden
2011-06-21pull back tags from viewer-releaseOz Linden
2011-06-21FIX VWR-25072eli_linden
2011-06-21FIX VWR-25071eli_linden
2011-06-21Automated merge with ↵Xiaohong Bao
https://bitbucket.org/VirLinden/viewer-development-shining-fixes
2011-06-21fix for SH-1650: [PUBLIC_JIRA_USERS] Widespread crash-to-desktop via ↵Xiaohong Bao
llvertexbuffer.cpp(1005) - "memory allocation for vertex data failed" or Render Pool 15
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-21merged .hgtags & BuildParamsDebi King (Dessie)
2011-06-21Added tag 2.7.4-start for changeset 6af10678de47Oz Linden
2011-06-20SH-1618 isFullbright causes AvatarEyes GL shader to fail to link.Aaron Stone
2011-06-20Added change to contributions.txt to get code review to workSquire
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-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