summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-04-26removed internal browser hack for getting auth code in favor of SLApp-only ↵Cho
approach
2013-04-26Merge vwr-dev-matGraham Madarasz
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-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-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-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-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-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
2013-04-24CHUI-845 : Make changeLine() a bit more resistant to unforseen line count ↵Merov Linden
values (i.e. 0) and a bit more general
2013-04-25added SLApp for fbcCho
2013-04-24merge changes for DRTVWR-309Oz Linden
2013-04-24tag merge of DRTVWR-309Oz Linden
2013-04-24FIX INTL-114 translation for 9 languages of major update from CHUI (based on ↵eli
latest merge with viewer-development)
2013-04-24sync with viewer-development (per DRTVWR-309)eli
2013-04-24Merged lindenlab/viewer-development-materials into defaultgraham linden
2013-04-24Automated merge with ↵Dave Parks
https://bitbucket.org/lindenlab/viewer-development-materials
2013-04-24Correct fix to include affect on ambient term and make work on Mac nVGraham Madarasz
2013-04-24Fix mismerge that lost Geenz colorspace conversion of diffuse in alphaVGraham Madarasz
2013-04-24Merge vwr-dev-matGraham Madarasz