summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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
2013-06-05added call to sharePhoto() with placeholder image for ACME-467Cho
2013-06-04MAINT-2740 convert to std::string based API for OutputDebug wrapper ↵Graham Madarasz
cleanliness after sage counsel (slight refrain)
2013-06-04ACME-484: Right-click menu only has 'Add Friend' and 'View Profile' options. ↵Gilbert Gonzales
Also multi-select is disabled.
2013-06-04fix modified virtual function names in platform-specific modulesOz Linden
2013-06-04MAINT-2740 fix XUI callsites in debug modeGraham Madarasz
2013-06-04MAINT-2740 and MAINT-2672 rework after code review for 2740 fix and include ↵Graham Madarasz
2672 fix needed for doing local integ tests
2013-06-04merge changes for build number fixOz Linden
2013-06-04fix local build numbers when compiling a merge before committing (two parents)Oz Linden
2013-06-04MAINT-2740 make use of OsOutputDebugString _DEBUG only to avoid interactions ↵Graham Madarasz
between Win 32-bit SEH and boost coroutine fiber stack handling
2013-06-04Automated merge with ↵Dave Parks
https://bitbucket.org/lindenlab/viewer-development-materials
2013-06-04BUG-2707 make use of OsOutputDebugString _DEBUG only on Windows to avoid ↵Graham Madarasz
throwing unhandlable exceptions in coroutines in RelWithDebInfo builds
2013-06-03NORSPEC-229 Fix for linux build.Dave Parks
2013-06-03BUG-2707 and not break use of venerable ifdefsGraham Madarasz
2013-06-03BUG-2707 disable sites calling OsOutputDebugString directly to identify ↵Graham Madarasz
which is tossing our errant exception
2013-06-03NORSPEC-195 Fix for incorrect alpha blending with deferred rendering enabled.Dave Parks
2013-06-03merge changes for 3.6.0-materials-beta1Oz Linden
2013-06-03Added tag 3.6.0-materials-beta1 for changeset fb1630153bacOz Linden
2013-06-03Fix and organize code for managing marker files that detect last_exec_event ↵Oz Linden
and last_exec_duration
2013-06-03BUG-2707 more logging crash huntingGraham Madarasz
2013-06-03MATBUG-136 Fix for glow being too bright on rigged attachments.Dave Parks
2013-06-03MATBUG-151 Fix for black textures on Intel HD when glow is present.Dave Parks
2013-06-03NORSPEC-227 fix settings XML merge derpGraham Madarasz
2013-06-03NORSPEC-227 fix settings XML merge derpGraham Madarasz
2013-06-03Automated merge with ↵Dave Parks
https://bitbucket.org/lindenlab/viewer-development-materials
2013-06-03NORSPEC-229 Fix for bad binormals on mirrored surfaces (use tangent ↵Dave Parks
calculator instead of binormal calculator, convert binormal centric code to tangent centric)