summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2013-04-11Merge in downstream code (chui fixes, materials)simon
2013-04-11Mergesimon
2013-04-11Mergesimon
2013-04-11Clean up transfer manager code and log messages. Reviewed by Kellysimon
2013-04-09merge with headcallum_linden
2013-04-09MAINT-2417 FIX Update Graphics tab layoutcallum_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-03MAINT-2558 - Add viewer debug setting for more logging on avatar render info.simon
Reviewed by Kelly
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-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-01MAINT-2511 : Mesh requests not handling time outs. Reviewed by Kellysimon
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
2013-03-29Additional fix for CHUI-903Mnikolenko ProductEngine
2013-03-29Merged in Chui beta6+ fixesprep@lindenlab.com
2013-03-29CHUI-903 FIXED Don't show toasts if Session floater is torn-off and in focus.Mnikolenko ProductEngine
2013-03-28MAINT-2426 : Viewer support for new simulator AvatarRenderInfo capability. ↵simon
Reviewed by Kelly
2013-03-28CHUI-799 FIXED Notification is not given to user when they select only ↵AlexanderP ProductEngine
friends and groups can IM me preference
2013-03-28sh-4014: Don't send appearance updates while editing.prep
2013-03-28merge changes for 3.5.0-beta6Oz Linden
2013-03-28CHUI-896 FIXED Line flashing and FUI button flashing not working correctly ↵AlexanderP ProductEngine
for CHUI notifications: added flashing of the line item after conv. floater opens
2013-03-28CHUI-905 (Viewer crashes while using Insert keyboard key in chat): Problem ↵Gilbert Gonzales
was because when insert was used at the end of a string of text, this would attempt to delete something past the bounds of the string...as a side effect the size of the segment was increasing even though the string length never changed. The segment size would be greater than the string size and would eventually cause an invalid read outside the bounds of the string.