summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2013-05-10Fixup merge diffsGraham Madarasz
2013-05-10ACME-348 : WIP : Add some traces to work out the protocol (temporary)Merov Linden
2013-05-10NORSPEC-173 Shrink size of matrix palette for backwards compatibility.Dave Parks
2013-05-10merge changes for 3.5.2-beta5Oz Linden
2013-05-10Merge with vwr-dev-matGraham Madarasz
2013-05-10Remove some unreachable codeDave Parks
2013-05-10fix merge error in 3.5.2 mergeOz Linden
2013-05-10merge changes for 3.5.2-beta4Oz Linden
2013-05-10merge changes for latest project changesOz Linden
2013-05-10NORSPEC-102 Rapid materials updates are not smooth to viewer which is ↵Kitty Barnett
editing the object
2013-05-09ACME-342 Format the PersonView so that it shows the avatar icon, SL name, FB ↵Gilbert Gonzales
icon, and FB name: Found a couple bugs that were causing the positioning of text to be incorrect in the 'Peope you may want to friend' tab.
2013-05-09ACME-342 Format the PersonView so that it shows the avatar icon, SL name, FB ↵Gilbert Gonzales
icon, and FB name: Rendering now matches the UX spec.
2013-05-09NORSPEC-164 fix TE copy ctor and operator= to include material pointer in ↵Graham Madarasz
addition to ID
2013-05-09NORSPEC-164 fix TE copy ctor and operator= to include material pointer in ↵Graham Madarasz
addition to ID
2013-05-09NORSPEC-168 separate UI handlers for spec and normal textures to avoid ↵Graham Madarasz
cross-talk and fix handling of bumpy/shiny menu items
2013-05-09NORSPEC-168 separate UI handlers for spec and normal textures to avoid ↵Graham Madarasz
cross-talk and fix handling of bumpy/shiny menu items
2013-05-09NORSPEC-170 make adv lighting checkbox reflect whether deferred shaders ↵Graham Madarasz
loaded successfully
2013-05-09NORSPEC-170 make adv lighting checkbox reflect whether deferred shaders ↵Graham Madarasz
loaded successfully
2013-05-09MAINT-2647 Fix for some objects not rendering until first LoD switch/selection.Dave Parks
2013-05-09MAINT-2665 FIX Crashes not being reported in some casesRichard Linden
made marker file lock use append, not truncate
2013-05-09ACME-348 : WIP : LLFacebookConnect refactorin completed. Not functional yet ↵Merov Linden
though.
2013-05-09remove duplications and other errors introduced during the mergeOz Linden
2013-05-08Rollback NORSPEC-156 change which fails to compile due to implicit castGraham Madarasz
2013-05-08Rollback NORSPEC-156 change which fails to compile due to implicit castGraham Madarasz
2013-05-08ACME-348 : WIP : LLFacebookConnect refactoringMerov Linden
2013-05-08ACME-342 Format the PersonView so that it shows the avatar icon, SL name, FB ↵Gilbert Gonzales
icon, and FB name: Adjusted personview/personmodel contain a suffix which is the FB username for SL+FB users
2013-05-08Pull merge from viewer-fbcMerov Linden
2013-05-08Fix fullbrightF in the eyes of ancient nV compilerGraham Madarasz
2013-05-08NORSPEC-156 back to the fix that actually worksGraham Madarasz
2013-05-08NORSPEC-156 back to the fix that actually worksGraham Madarasz
2013-05-08NORSPEC-156 move gamma correction to vert shaderGraham Madarasz
2013-05-08NORSPEC-156 modify fullbrightF colorspace conversion to eliminate delta with ↵Graham Madarasz
non-deferred fullbright look
2013-05-08merge changes for 3.5.1-releaseOz Linden
2013-05-08temporary hack for fb demo to use https://pdp15.lindenlab.com instead of ↵Cho
going through cap server
2013-05-08Merged lindenlab/viewer-development-materials into defaultgraham linden
2013-05-08Adding follow_redirects parameter to LLHTTPClient get/head variants. Not ↵Don Kjer
following redirects for facebook connect requests.
2013-05-07Automated merge with ↵Dave Parks
https://bitbucket.org/lindenlab/viewer-development-materials
2013-05-07NORSPEC-147 make repeats per meter disabled when in planar mode and make UI ↵Graham Madarasz
reps consistent across layers
2013-05-08NORSPEC-156 move gamma correction to vert shaderGraham Madarasz
2013-05-08NORSPEC-156 modify fullbrightF colorspace conversion to eliminate delta with ↵Graham Madarasz
non-deferred fullbright look
2013-05-07NORSPEC-147 make repeats per meter disabled when in planar mode and make UI ↵Graham Madarasz
reps consistent across layers
2013-05-07Fix for bad light map generation/sampling.Dave Parks
2013-05-07ACME-343 : Add Connect to Facebook menu itemMerov Linden
2013-05-07NORSPEC-119 another attempt at individual faces edits without side-effectsGraham Madarasz
2013-05-07NORSPEC-119 another attempt at individual faces edits without side-effectsGraham Madarasz
2013-05-07Merge vwr-dev-matGraham Madarasz
2013-05-07NORSPEC-165 tweak panel_tools_texture layout to uncrop the planar align checkboxGraham Madarasz
2013-05-07merge changes for DRTVWR-299Oz Linden
2013-05-07NORSPEC-51 Fix (additional) Added missing imagecallum_linden
2013-05-07merge changes for DRTVWR-315Oz Linden