summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-05-07merge changes for DRTVWR-315Oz Linden
2013-05-07tag merge of DRTVWR-315Oz Linden
2013-05-07tag merge of DRTVWR-316Oz Linden
2013-05-06Merge with lindenlab/viewer-development-materialscallum_linden
2013-05-06MAINT-2657 Fix (speculative) for Crash in LLAudioEngine_FMODEX::shutdown()callum_linden
2013-05-06Automated merge with ↵Dave Parks
https://bitbucket.org/lindenlab/viewer-development-materials
2013-05-06NORSPEC-118 fix regression of 118 from extra conditions added for 151Graham Madarasz
2013-05-06NORSPEC-118 fix regression of 118 from extra conditions added for 151Graham Madarasz
2013-05-06NORSPEC-162 Fix for objects with materials set ignoring "tranparency %" value.Dave Parks
2013-05-06Merged lindenlab/viewer-development-materials into defaultgraham linden
2013-05-06NORSPEC-94 fix this without setting in getState causing round-trip wierdness ↵Graham Madarasz
with spec color picker
2013-05-06NORSPEC-94 fix this without setting in getState causing round-trip wierdness ↵Graham Madarasz
with spec color picker
2013-05-06MATBUG-78 Fix for alpha lighting falloff not matching for sunlight when ↵Dave Parks
shadows are enabled.
2013-05-06NORSPEC-126 Make objects with normal maps applied obey legacy shiny settingsGraham Madarasz
2013-05-06NORSPEC-126 Make objects with normal maps applied obey legacy shiny settingsGraham Madarasz
2013-05-04Remove unnecessary assert as ternary protects against null ptr derefGraham Madarasz
2013-05-04Remove unnecessary assert as ternary protects against null ptr derefGraham Madarasz
2013-05-03NORSPEC-160 fix trashing of spec map from sunshine integration snafuGraham Madarasz (Graham)
2013-05-03NORSPEC-160 fix trashing of spec map from sunshine integration snafuGraham Madarasz (Graham)
2013-05-03MAINT-2655: "Block button in permissions dialog prompt does not block object"Kelly Washington
* Fix mute button.
2013-05-03mergeKelly Washington
2013-05-03MAINT-2646 Viewer should neither grant nor display prompts for unimplemented ↵Kelly Washington
LSL permissions * Switch mute to use task id. reviewed with Simon
2013-05-03NORSPEC-151 make disabling bumpyshiny disable adv lighting model as wellGraham Madarasz (Graham)
2013-05-03NORSPEC-151 make disabling bumpyshiny disable adv lighting model as wellGraham Madarasz (Graham)
2013-05-03Merge with headcallum_linden
2013-05-03Merge with vwr-dev-matGraham Madarasz (Graham)
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-02Automated merge with ↵Dave Parks
https://bitbucket.org/lindenlab/viewer-development-materials
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-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-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-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-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-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