summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-04-26Merge vwr-dev-matGraham Madarasz
2013-04-26mergeprep@lindenlab.com
2013-04-26llappearance package updateprep@lindenlab.com
2013-04-26MergeGraham Madarasz
2013-04-26Fix ifdefs around asserts broken in release only by mergeGraham Madarasz
2013-04-26ACME-252 Create AvatarFolderItemView: Now when connecting to facebook using ↵Gilbert Gonzales
the + button the fctest two tab is populated.
2013-04-26ACME-252 Create AvatarFolderItemView: Corrected person_tab_view.xml and ↵Gilbert Gonzales
person_view.xml to have the proper parent tag. It was conversation_view_session for both which was wrong. Also updated the selected color for the personview.
2013-04-26Automated merge with ↵Dave Parks
https://bitbucket.org/lindenlab/viewer-development-materials
2013-04-26Appease TC cmake OCD about substring argsGraham Madarasz
2013-04-26Provide LLGLSLShader backwards compat so as not to break the appearance utilityGraham Madarasz
2013-04-26Fix linux breakage from sunshine mergeGraham Madarasz
2013-04-26Restore hysteresis in llviewertexture.cpp and side-step unused var (now used ↵Graham Madarasz
again)
2013-04-26Fix llmediadataclient test to include new dep on llprimitive and fix bogus ↵Graham Madarasz
boost lib refs in llprimitive cmake def
2013-04-26SH-4142 FIX - made error messages a bit more informativeBrad Payne (Vir Linden)
2013-04-26SH-4142 FIX - avoid stack overflow in an AISv3 responder failure case.Brad Payne (Vir Linden)
2013-04-26mergeBrad Payne (Vir Linden)
2013-04-26Merge viewer-dev-mat and fix llvovolume.cpp missed sunshine mergesGraham Madarasz
2013-04-25Merge 3.5.1 into MaterialsGraham Madarasz
2013-04-25ACME-252 Create AvatarFolderItemView: Now the sub items of the persontab are ↵Gilbert Gonzales
drawn with different highlights depending on if they are selected or moused over.
2013-04-25ACME-251: This should be final commit for this task, now the peopletab looks ↵Gilbert Gonzales
like the accordion tab.
2013-04-25Clean up LLSingleton work - special case to re-create instance if it's been ↵simon
deleted.
2013-04-25Bump resolution on lightFunc to avoid banding.Dave Parks
2013-04-25Added tag 3.5.2-beta1 for changeset 106f19cc011aOz Linden
2013-04-25NORSPEC-104 Fix for texture animation sometimes not overriding specular and ↵Dave Parks
normal map texture coordinates.
2013-04-25Added tag 3.5.1-release for changeset 13149a524874Oz Linden
2013-04-25Revert ares and libcurl version update that was causing problems, revise curlsimon
handle duplication code. Reviewed by Kelly
2013-04-25SH-4137 WIP - added callback-based support for purge descendents, remove ↵Brad Payne (Vir Linden)
category
2013-04-25increment viewer version number to 3.5.2 (in new file)Oz Linden
2013-04-25NORSPEC-106 Fix for emissive mask overriding environment mask.Dave Parks
2013-04-25merge changes for latest viewer-developmentOz Linden
2013-04-25merge changes for latest rendering fixesOz Linden
2013-04-25NORSPEC-67: fix update problem by not updating texture pickers when they are ↵Oz Linden
open
2013-04-25add isPickerShown methodOz Linden
2013-04-25BUILDFIX: removing unused variablesNyx Linden
2013-04-25add some debug logging, make a single return in "get" methodOz Linden
2013-04-25ACME-251: Create AvatarFolderItemView: Fixed a bug that was causing facebook ↵Gilbert Gonzales
friends to not be inserted into the proper friends tab.
2013-04-25NORSPEC-118 Compatibility pass against advanced lighting disabled.Dave Parks
2013-04-25mergeNyx Linden
2013-04-25SH-4050 FIX camera goes underground if hover set low enoughNyx Linden
Changing viewer limit for avatar height to match server limit, camera does not go underground. Also clarified where we do not need avatar offset in the code, through comments
2013-04-25Enhance "duplicate seed caps" log message ... this needs more investigation.simon
Reviewed by Kelly
2013-04-25Diagnostic message for debugging adv lighting enable fail on MB Air 2k11Graham Madarasz
2013-04-25CHUI-759 FIXED Group invites never received in do not disturb mode when ↵PavelK ProductEngine
leaving do not disturb mode
2013-04-30CHUI-953 FIXED Close conversation floater when quitting viewerMnikolenko ProductEngine
2013-04-29CHUI-956 FIXED Vertical scrollbar in conversation list not scrolls off bottommaksymsproductengine
2013-04-26CHUI-859 FIXED Conversation panel moves when new message received with Open ↵maksymsproductengine
Conversation window preference
2013-04-26CHUI-952 FIXED Disable single line mode when restoring floater.Mnikolenko ProductEngine
2013-04-25CHUI-941 FIXED [CHUIBUG]Inline input is not available in 3.5.0maksymsproductengine
2013-04-25CHUI-934 FIXED Do not add to vector if session is closed to avoid crash.Mnikolenko ProductEngine
2013-04-24NORSPEC-146 Fix for objects with alpha mode set to none or mask being shinyDave Parks
2013-04-24ACME-251 Create AvatarFolderItemView: Adding in code to make the persontab's ↵Gilbert Gonzales
function more like accordiontabs