summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-04-30Merge 3.5.1 into MaterialsGraham Madarasz
2013-04-30Fix vwr-dev-mat merge bugs in llpanelface (missing Oz fix) and XMLGraham Madarasz
2013-04-30MATBUG-78 Fix for alpha lighting distance attenuation not matching opaque ↵Dave Parks
distance attenuation
2013-04-30ACME-252 Create AvatarFolderItemView: Optimization. Now the widths for the ↵Gilbert Gonzales
personview are computed once and stored staticically since they don't change per control.
2013-04-30MAINT-2640 Fix for Wrong name of the checkbox Pathfinding view/test floater.callum_linden
2013-04-30Override default channel from buildscripts projectOz Linden
2013-04-30mergeGilbert Gonzales
2013-04-30mergeGilbert Gonzales
2013-04-30Merge downstream code from viewer-bearsimon
2013-04-30merge changes for CHOP-913Oz Linden
2013-04-29Pull from viewer-fbcMerov Linden
2013-04-29ACME-275 : WIP : Starting to write the LLPersonViewerFilter codeMerov Linden
2013-04-29ACME-252 Create AvatarFolderItemView: Now mouse over of peopleview items ↵Gilbert Gonzales
show the info button and profile button.
2013-04-30updated to grab FB URLs from serverCho
2013-04-29ACME-252 Create AvatarFolderItemView: Now the personview contains all icons ↵Gilbert Gonzales
that the avatarlistitem view contains.
2013-04-29Merge in downstream code from viewer-betasimon
2013-04-29BUG-2295/MAINT-2624 [FIXED] Crash in HttpOpRequest::stageFromActive w/ ↵Monty Brandenberg
Content-Range Don't rely on a response body being present should a Content-Range header be parsed. Unit tests captured the original crash and confirm the fix.
2013-04-29SH-4140 FIX, SH-3860 FIX - appearance on first-time login should now be ↵Brad Payne (Vir Linden)
reliable without depending on retries of appearance update requests. May still see COF mismatch errors in the log - these will only be fixed, if at all, with AISv3 integration.
2013-04-29NORSPEC-153 Workaround for AMD driver bug that doesn't like '\' on #define'sDave Parks
2013-04-29Merge in downstream viewer-betasimon
2013-04-29MAINT-2613: remove duplicate entry for ↵Oz Linden
"DisablePrecacheDelayAfterTeleporting", and fix a few other llsd validity problems
2013-04-30pull tag for 3.5.1-releaseOz Linden
2013-04-29logcontrol.xml fix this time for sure.Brad Payne (Vir Linden)
2013-04-29removed debugging code that got pushed incorrectly.Brad Payne (Vir Linden)
2013-04-29removed overly enthusiastic log settingBrad Payne (Vir Linden)
2013-04-29mergeBrad Payne (Vir Linden)
2013-04-29SH-4144 FIX - Debug setting now disables use of AISv3 by default. This is ↵Brad Payne (Vir Linden)
just a workaround for the problem of aditi advertising the cap when it isn't really present. Once we have aditi in a consistent state we should remove the setting, or at least default it to true.
2013-04-29Merged with https://bitbucket.org/lindenlab/viewer-development-materialsGeenz
2013-04-29Fix any missing color space conversions where appropriate, tweak the sun's ↵Geenz
intensity to match pre-gamma correction results, and also mask spotlight specular by the projected texture.
2013-04-29ACME-252 Create AvatarFolderItemView: Now the avatar icon will display but ↵Gilbert Gonzales
it is not yet functional
2013-04-29SH-4146 FIX petite avatars can't touch the groundNyx Linden
adjusted avatar hover limits to make sure that they are not forced to go above the default
2013-04-26Pull merge from viewer-fbcMerov Linden
2013-04-26ACME-272 : Add the top toolbar to the FBC panel 2Merov Linden
2013-04-26Convert LLThreadSafeRefCount back to atomic ref counting. Reviewed by Kellysimon
2013-04-26made sendURLToOtherInstance() happen before viewer window actually appears, ↵Cho
in the event of an external browser launching a SLApp
2013-04-26Fix Xui cloud raining on sunshinybumpinessGraham Madarasz
2013-04-26LLAppearance package updateprep@lindenlab.com
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-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)