summaryrefslogtreecommitdiff
path: root/indra/newview
AgeCommit message (Collapse)Author
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 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-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-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-21STORM-1352 WIP Issue a warning if a NULL chat toast is encountered.Vadim ProductEngine
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-20STORM-1352 WIP Changed sort functor return type to bool.Vadim ProductEngine
2011-06-20SH-1618 isFullbright causes AvatarEyes GL shader to fail to link.Aaron Stone
2011-06-20mergeDave Parks
2011-06-19STORM-1396 Storm-787 (mute gestures) also mutes sounds from objectsJonathan Yap
2011-06-18STORM-1392 Add Nearby Voice to the Communicate menuJonathan Yap
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
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-17Changed popups for accepting inv offers from SystemMessage to ↵LanceCorrimal
SystemMessageTip: STORM-323
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-16STORM-1352 WIP Attempting to fix a crash in ↵Vadim ProductEngine
LLNearbyChatScreenChannel::showToastsBottom(). Apparently, a nearby chat toast got somehow destroyed while still remaining in the list of active toasts. Attempt to sort active toasts in showToastsBottom() then triggered the crash. I don't know how to reproduce the crash, i.e. force destroying a toast in a way that its onClose() method (which would remove references to the toast) isn't called. So we'll just remove references to the toast whenever it's destroyed.
2011-06-16mergeBrad Payne (Vir Linden)
2011-06-16SH-1166 FIXBrad Payne (Vir Linden)
2011-06-16sync with viewer-developmenteli_linden