summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-06-08NORSPEC-233 fix default value and material apply logic errorsGraham Madarasz
2013-06-07Pull merge from viewer-fbcMerov Linden
2013-06-07ACME-508 : Surface facebook connection errors in a modal notification dialogMerov Linden
2013-06-08mergeCho
2013-06-08added Facebook status update feature for ACME-502, ACME-503, and ACME-504Cho
2013-06-07NORSPEC-230 Fix for incorrect gamma under water.Dave Parks
2013-06-07NORSPEC-233 WIP fix completely bogus substitution of offsets for scales and ↵Graham Madarasz
make scale accessors get with the program
2013-06-07NORSPEC-242 Fix for infinity and NaN showing up in tangents and texture ↵Dave Parks
coordinates sometimes.
2013-06-07NORSPEC-233 WIP cleanup and fix crasher in templated material get driver funcGraham Madarasz
2013-06-07Fix busted WIP check-inGraham Madarasz
2013-06-07Merge MAINT-2740 crash fixGraham Madarasz
2013-06-07mergeGilbert Gonzales
2013-06-07ACME-470: Adjusting 'Check in to Facebook' text to 'Check in to Facebook...'Gilbert Gonzales
2013-06-07Merge vwr-dev-matGraham Madarasz
2013-06-07NORSPEC-233 WIP clean up regressions in enable/tentative logic from reworkGraham Madarasz
2013-06-07NORSPEC-233 WIP make gcc like it and do some clean-upGraham Madarasz
2013-06-07NORSPEC-233 WIP for individual material param edits across hetero object ↵Graham Madarasz
selections
2013-06-06ACME-464 : Fixed : We connect to FB when bringing up the Upload to FB ↵Merov Linden
Snapshot panel
2013-06-06ACME-464 : WIP : Post in the snapshot Panel correctly disabled / enabled ↵Merov Linden
according to FB connection status
2013-06-05Pull merge from viewer-fbcMerov Linden
2013-06-05ACME-464 : WIP : Make the menu Connect to FB only connect and be disabled if ↵Merov Linden
the user is already connected
2013-06-05mergeGilbert Gonzales
2013-06-05ACME-471: Now using the actual map top-down image for the checked in location.Gilbert Gonzales
2013-06-06uncommented the placeholder image uploadCho
2013-06-06removed unnecessary passing of image captionCho
2013-06-05mergeCho
2013-06-05added callback to post photo with actual image urlCho
2013-06-05ACME-485 : Temporary facebook.png icon for the snapshot panelMerov Linden
2013-06-05Automated merge with ↵Dave Parks
https://bitbucket.org/lindenlab/viewer-development-materials
2013-06-05ACME-471: Code cleanup, just moving some code.Gilbert Gonzales
2013-06-05ACME-471: Code cleanup, instead of duplicating code from ↵Gilbert Gonzales
LLAgentUI::buildLocationString, now calling LLAgentUI::buildLocationString with a flag to perform a similar operation.
2013-06-05Unwind cruft from hunting for 2707 they won't end up in vwr-dev-matGraham Madarasz
2013-06-05NORSPEC-237 nix resetting the keyboard focus to cripple the repeats per ↵Graham Madarasz
meter control
2013-06-05NORSPEC-232 Fix for broken alpha masking with basic shaders disabled.Dave Parks
2013-06-05MergeGraham Madarasz
2013-06-05Automated merge with ↵Dave Parks
https://bitbucket.org/lindenlab/viewer-development-materials
2013-06-05NORSPEC-238, NORSPEC-225 Fix for specular map alpha channel being improperly ↵Dave Parks
used and glossiness bludgeoning environment intensity. Reviewed/written by Graham.
2013-06-05NORSPEC-238 NORSPEC-225 fix issues with env mask term being ignored and or ↵Graham Madarasz
damped by glossiness
2013-06-05NORSPEC-238 NORSPEC-225 fix issues with env mask term being ignored and or ↵Graham Madarasz
damped by glossiness
2013-06-05NORSPEC-238 spec map env mask term in alpha chan ignoredGraham Madarasz
2013-06-05NORSPEC-238 spec map env mask term in alpha chan ignoredGraham Madarasz
2013-06-05NORSPEC-236 Fix for rigged attachments with materials not rendering under ↵Dave Parks
water when advanced lighting is enabled.
2013-06-05MAINT-2740 more comment grooming and NULL string guardGraham Madarasz
2013-06-05BUG-2707 fix comment typos, remove unnecessary winmm_shim changes, and ↵Graham Madarasz
revert 2672 fix included only for local integ test
2013-06-05MErgeGraham Madarasz
2013-06-05BOOG2707 uncomment cleared suspectsGraham Madarasz
2013-06-05ACME-471: In last commit was not using the correct name and location. Now ↵Gilbert Gonzales
using the proper name and location.
2013-06-04mergeGilbert Gonzales
2013-06-04ACME-471: Once connected to facebook, a user can use the 'Check in to ↵Gilbert Gonzales
Facebook' button under the 'Me' menu to make a check in post to Facebook
2013-06-04MAINT-2740 put debug output back with guard of debugger presence per Nat ↵Graham Madarasz
review suggestion