summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2013-06-17mergeGilbert Gonzales
2013-06-17ACME-558: Adding logging information, when a friends list is received the ↵Gilbert Gonzales
log message 'Facebook: Friends list received' will be displayed. When the suggested friends list is updated the log message 'Facebook: Updating Suggested Friends List' will be displayed.
2013-06-14Merge with viewer-fbcMerov Linden
2013-06-14ACME-520 : Add more extended state in LLFacebookConnect and handle it ↵Merov Linden
consistently and transparently from the public interface
2013-06-14ACME-558 Update LLPanelPeople to use the friends list callback and remove ↵Gilbert Gonzales
the timer dependencies
2013-06-14increment viewer version to 3.6.1Oz Linden
2013-06-14NORSPEC-251 fix issues with binding unloaded standard bumpmapsGraham Linden
2013-06-14NORSPEC-266 fix issues with observer feedback on edits of material map ↵Graham Linden
parameters
2013-06-14Disable asserts in CalculateTangentArray (discussed with davep) to avoid ↵Graham Linden
debugging interruptions from bad assets
2013-06-13ACME-537: Prevented error code for showing up when disconnected from FB and ↵Gilbert Gonzales
opening the 'Friends' tab of the people panel.
2013-06-13NORSPEC-250 speculative stab in the darkGraham Linden
2013-06-13Fix ternary use found illegit in the eyes of GCCGraham Madarasz
2013-06-13Merge vwr-dev-matGraham Madarasz
2013-06-13correct DOS line endingsOz Linden
2013-06-13NORSPEC-263 replaced dropped deg to rad conversion between UI and material ↵Graham Madarasz
update
2013-06-13MAINT-2632 speculative guards in display_startup based on prevalence of ↵Graham Madarasz
crashes ending there (no repro, unfortunately)
2013-06-12NORSPEC-260 fix issues with OK after pressing none being intepreted as add a ↵Graham Madarasz
null normal map
2013-06-12NORSPEC-251 fixed and 258 not regressedGraham Madarasz
2013-06-12Remove NaN guards from vopartgroup and volume codeGraham Madarasz
2013-06-12Cleanup rollback and try point MIPs experiment to see if that's what is ↵Graham Madarasz
hosing the Mac on 10.6.8
2013-06-12MergeGraham Madarasz
2013-06-12Backout tangent assert experimentGraham Madarasz
2013-06-12Pedantic adj overly concerned with minute details or formalismsGraham Madarasz
2013-06-12Changes to protect against use of normalize3fast on degenerate vectorsGraham Madarasz
2013-06-12Fix issues with NaNs in tangent data from using normalize3fast on ↵Graham Madarasz
zero-length vectors and other data conditioning; also added assert to normalize3fast to make finding these problems easier in the future
2013-06-11NORSPEC-258 and NORSPEC-226 make tex picker close refresh build tool UI ↵Graham Madarasz
correctly and fix issues with transition from no-bumps to normal maps
2013-06-12cleaned up FBC snapshot feature and made it work with new direct upload ↵Cho
route on FBC API
2013-06-11Fix build failure from warning and dav3p no-JIRA bug about normal map scale ↵Graham Madarasz
editing
2013-06-11NORSPEC-257 can't use automated TEMaterialGet functor as we need two ↵Graham Madarasz
possible defaults for diffuse alpha mode based on the alpha content of the diffuse texture
2013-06-11Speculative fix for tangent calc asserts on MacGraham Madarasz
2013-06-11Automated merge with ↵Dave Parks
https://bitbucket.org/lindenlab/viewer-development-materials
2013-06-10NORSPEC-222 fix issues with removing the use texture item selecting weave ↵Graham Madarasz
when the TE was BUMPY_TEXTURE, but no normal map was applied
2013-06-10NORSPEC-257 fix alpha mode display incorrect default when alpha is present ↵Graham Madarasz
in tex
2013-06-10MAINT-2777 work-around for APR assert_always causing random crash in ↵Graham Madarasz
materials build
2013-06-10ACME-464, ACME-509 : Skip 302 error when prompting the user for errorsMerov Linden
2013-06-10NORSPEC-251 fix issues with not binning objects changed from having a ↵Graham Madarasz
material to using legacy bumps causing incorrect rendering
2013-06-10NORSPEC-252 fix reverting normal maps to noneGraham Madarasz
2013-06-10NORSPEC-242 Followup, fix a couple more sources of NaN and infinity.Dave Parks
2013-06-10NORSPEC-247 Fix for rigged attachments with alpha masking on occluding alpha ↵Dave Parks
object when 100% transparent.
2013-06-10Line endings.Dave Parks
2013-06-10MAINT-2414 fix for texture cache crasherGraham Madarasz
2013-06-10Automated merge with ↵Dave Parks
https://bitbucket.org/lindenlab/viewer-development-materials
2013-06-10NORSPEC-248 fix broken repeats handling in media modeGraham Madarasz
2013-06-10Merge vwr-dev-matGraham Madarasz
2013-06-10NORSPEC-87 fix diffuse repeats display as wellGraham Madarasz
2013-06-10NORSPEC-87 fix regression from NSPEC 233 fix typo which is breaking norm ↵Graham Madarasz
repeats display
2013-06-10NORSPEC-87 fix regression from 233 fix that made spec repeats info show in ↵Graham Madarasz
norm tab
2013-06-09NORSPEC-246 fix shader compile errors from missing returnGraham Madarasz
2013-06-09NORSPEC-246 fix issues with normal encoding on precision-deprived hardware ↵Graham Madarasz
and remove haxors
2013-06-09NORSPEC-246 WIP fix callsite missed when swapping in macro implGraham Madarasz