summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-05-03Merge with vwr-dev-matGraham Madarasz (Graham)
2013-05-03CHUI-963 (Toggling chat fui button twice tears off nearby chat to lower left ↵mberezhnoy
corner also deletes other open conversations)
2013-05-03MAINT-2646 Viewer should neither grant nor display prompts for unimplemented ↵Kelly Washington
LSL permissions * Change text of dialog * Add callback for mute button reviewed with Richard and Widely.
2013-05-02Cmake doesn't like mesimon
2013-05-02Fix the cmake fixsimon
2013-05-02Automated merge with ↵Dave Parks
https://bitbucket.org/lindenlab/viewer-development-materials
2013-05-02Pull from viewer-releaseMerov Linden
2013-05-02Fix line endingssimon
2013-05-02NORSPEC-157 make texture repeats/offsets controls display in media modeGraham Madarasz
2013-05-02NORSPEC-157 make texture repeats/offsets controls display in media modeGraham Madarasz
2013-05-02mergeNyx Linden
2013-05-02SH-4060 FIX avatar hover being set to minimum at seemingly random timesNyx Linden
avatar hover was being temporarily set to -2.0 for the preview render, which was triggering the minimum enforcement, even when the user's requested value is no where near the minimum. Added a flag to disable the minimum enforcement if we are temporarily changing the value.
2013-05-02NORSPEC-149 Fix for objects set to alpha blend sometimes getting tossed into ↵Dave Parks
alpha mask pool.
2013-05-02NORSPEC-99 add break statement to fix legacy bump vert program from being ↵Graham Madarasz
stomped with inappropriate material prog sans skinning
2013-05-02Merged lindenlab/viewer-development-materials into defaultgraham linden
2013-05-01NORSPEC-119 redux : fix getState to find the material ID of individually ↵Graham Madarasz
selected faces correctly
2013-05-02NORSPEC-99 add break statement to fix legacy bump vert program from being ↵Graham Madarasz
stomped with inappropriate material prog sans skinning
2013-05-01NORSPEC-119 redux : fix getState to find the material ID of individually ↵Graham Madarasz
selected faces correctly
2013-05-01NORSPEC-145 Fix for improper rendering of glow pass for rigged meshes.Dave Parks
2013-05-01mergeBrad Payne (Vir Linden)
2013-05-01SH-4154 WIP - gInventory.validate() has inventory model internal consistency ↵Brad Payne (Vir Linden)
checks
2013-05-01Merge vwr-dev-matGraham Madarasz
2013-05-01More informative light func tex binding messageGraham Madarasz
2013-05-01Fix for sky being too bright with advanced lighting enabledDave Parks
2013-05-01Manually pull in Richard's fixes for llcommon/llsingleton.hsimon
2013-05-01Automated merge with ↵Dave Parks
https://bitbucket.org/lindenlab/viewer-development-materials
2013-05-01Fix up specular highlights and gamma correction for projectors.Dave Parks
2013-05-01Add some diag for debugging light func tex bindingGraham Madarasz
2013-05-01LLAppearance package updateprep
2013-05-01NORSPEC-51 Fix for Incorrect Texture icon used in build tool when normal or ↵callum_linden
specular map is not set to 'Use Texture'
2013-05-01mergeBrad Payne (Vir Linden)
2013-05-01Add missing debian dir for appearnace util packagingGraham Madarasz (Graham)
2013-05-01NORSPEC-144 make code to nerf use of FBOs on old windows drivers not affect ↵Graham Madarasz (Graham)
Mac too
2013-05-01NORSPEC-144 make code to nerf use of FBOs on old windows drivers not affect ↵Graham Madarasz (Graham)
Mac too
2013-05-01Restore mismerged sunshine changeGraham Madarasz
2013-05-01Merge vwr-dev-matGraham Madarasz
2013-05-01Added tag 3.5.2-beta2 for changeset 509b97acc4caOz Linden
2013-05-01MAINT-2629: limit stream searches to prevent hangs on bad streamscallum
2013-04-30MAINT-2646 Viewer should neither grant nor display prompts for unimplemented ↵Kelly Washington
LSL permissions * Add the newer run time permissions to the viewer * Filter requested permissions by those the viewer knows about * Show a dialog indicating unknown permissions were requested and a new viewer will be needed to grant them. reviewed with Simon and Soft
2013-04-30Merge vwr-dev-mat againGraham Madarasz
2013-04-30SH-4140 FIX - removed a gratuitous log messageBrad Payne (Vir Linden)
2013-04-30Fix gcc ternary type inference fail to unbreak Mac and Linux buildsGraham Madarasz
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-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-30Merge downstream code from viewer-bearsimon
2013-04-30merge changes for CHOP-913Oz Linden
2013-04-29Merge in downstream code from viewer-betasimon