summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2013-04-19merge up to latest viewer-development for merge to 3.5.2Oz Linden
2013-04-19merge changes for DRTVWR-294Oz Linden
2013-04-18merge changes for DRTVWR-298Oz Linden
2013-04-18add newlineOz Linden
2013-04-18Blank line on end of files as per commit hook requirementscallum_linden
2013-04-18merge changes for 3.5.1-beta2Oz Linden
2013-04-17BUG-2326 MAINT-2596 FIX crash when selecting non-existant user in resident ↵Nyx Linden
picker Added checks to validate that the selection list is non-empty
2013-04-17New fix for the fix for Linux build now that gcc upgraded to 4.6 by defaultcallum_linden
2013-04-17Fix for Linux build now that gcc upgraded to 4.6 by defaultcallum_linden
2013-04-17SUN-70 MAINT-2597 FIX Crash when trying to edit no-modify objectsNyx Linden
Added protection for invalid / empty inventory contents
2013-04-17fix for missed merge changescallum_linden
2013-04-17Merge with viewer-developmentcallum_linden
2013-04-17SH-4125 FIX - problem was unpredictable ordering of avatar and ↵Brad Payne (Vir Linden)
llviewerregion deletion. Avoid trying to send metrics when we're shutting down and it's too late anyway. Reviewed by Nyx
2013-04-16merge up to 3.5.2 developmentOz Linden
2013-04-12increment version to 3.5.2Oz Linden
2013-04-04merge with latest viewer-developmentNyx Linden
2013-04-04SH-4059 FIX other's hover parameters affects your avatar's settingNyx Linden
Added an additional sanity check to make sure that other avatars don't affect your wearables.
2013-04-03SH-4051 REVERT teen accounts unable to remove underclothes even when ↵Nyx Linden
switching outfits Reverting fix as additional problems were found that could lead to even accidental nudity. This fix is not required for the current release as it is not a regression. Will review options for fixing for the next release.
2013-04-03mergeNyx Linden
2013-04-03SH-4050 FIX camera goes below ground when avatar offset set to 0Nyx Linden
Added a constraint to ensure that the avatar's height (with offset) does not go below 0.1 meters. Camera was getting confused since the avatar's effective height was negative. Note the avatar is mostly underground/contorted even at 0.1 meters, but most users setting values this low will be making ultra-tinies and would be hiding the avatar mesh. Camera stays above ground when height is at 0.1.
2013-04-03SH-4058 - log spam reduction initiative.Brad Payne (Vir Linden)
2013-04-03SH-3058 WIP - disable debug-level logging for avatar by defaultBrad Payne (Vir Linden)
2013-04-02mergeBrad Payne (Vir Linden)
2013-04-02SH-4057 FIX - cleaned up old canUseHTTP logic, now lives in llviewertexture.cppBrad Payne (Vir Linden)
2013-04-02mergeNyx Linden
2013-04-02BUILDFIX commit policy fixesNyx Linden
2013-04-02mergeprep@lindenlab.com
2013-04-02Merged in chui beta code.prep@lindenlab.com
2013-04-02Removed setCanUseHTTP override in llvoavatarBrad Payne (Vir Linden)
2013-04-02mergeBrad Payne (Vir Linden)
2013-04-02SH-4057 FIX - host bake textures should start with UDP fetching now, instead ↵Brad Payne (Vir Linden)
of waiting to fail down
2013-04-02change initLogging virtual functions to void (returns were ignored anyway)Oz Linden
2013-04-02Add reporting of last_exec_durationOz Linden
(and clean up logic around multiple instances)
2013-04-02SH-4051 FIX problem with teen account and undershirt layersNyx Linden
Updated logic for teen accounts, to ensure that during any transition that they are wearing at least one undershirt wearable and one underpants wearable.
2013-04-02SH-4044 FIX voice dot is offset vertically if using avatar height offsetNyx Linden
Added the height offset in one too many places. fixing.
2013-04-02CHUI-811 FIXED [CHUIBUG]Too much spacing around the new chat UI elementsAlexanderP ProductEngine
2013-04-01CHUI-896 : ADD FIX : Line flashing and FUI button flashing not working ↵AlexanderP ProductEngine
correctly for CHUI notifications backed out 902caf2 and (partly) d498514; case "NOT_ON_TOP" was fixed
2013-04-01mergeGilbert Gonzales
2013-04-01CHUI-796 (User doesn't get all messages in 'do not disturb' mode): Now when ↵Gilbert Gonzales
a conversation is focused by clicking on it's line item, selecting a torn off floater or unminimized a torn off floater the stored notifications for that conversation will be removed.
2013-04-01CHUI-907 : Fixed! Suppress inexistant menu item and duplicated registrar ↵Merov Linden
entry to avoid warning
2013-04-01CHUI-907 : Prevent warning when parsing menus adding name to menu_item_checkMerov Linden
2013-04-01CHUI-904 FIXED Set the focus on the Nearby chat floater after setting ↵Mnikolenko ProductEngine
visibility.
2013-04-01mergemberezhnoy
2013-04-01merge changes for 3.5.0-beta7Oz Linden
2013-04-01CHUI-886 (Time in front of the name is not displayed when the Conversations ↵mberezhnoy
size is reduced to a minimum.)
2013-03-29CHUI-807 : Trace add and remove sessionsMerov Linden
2013-03-29CHUI-807 : Add more defensive coding. Also trace in log the sessions created ↵Merov Linden
so we'll have a better idea of what people do with conversations if we see that crash again.
2013-03-29mergeNyx Linden
2013-03-29SUN-57 SH-4039 FIX bake fail on non-ssb regionsNyx Linden
We were getting the texture ID from the type,index couple, but were not passing in index, which defaulted to 0. texture ID is available from the texture object itself, so using that and removing the index parameter to prevent future confusion.
2013-03-29Another Chui beta6+ merge to deal with build issuesprep@lindenlab.com