summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-05-11merge latest integration repo changesOz Linden
2013-05-10NORSPEC-132 Fix for Rotation degree has range -9999.00..9999.00callum_linden
2013-05-10Put back normal map and spec map initializers/destruction, delete FMOD refs ↵Graham Madarasz
(unneeded with FMODEX), make indra.l/y safe for bison >= 2.7
2013-05-10merge changes for 3.5.2-beta5Oz Linden
2013-05-10Added tag 3.5.2-beta5 for changeset 895628bb5e16Oz Linden
2013-05-10merge changes for MAINT-2647Oz Linden
2013-05-10tag merge of MAINT-2647Oz Linden
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-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-09Added tag 3.5.2-beta4 for changeset a314f1c94374Oz Linden
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-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-08NORSPEC-156 back to the fix that actually worksGraham Madarasz
2013-05-08merge changes for 3.5.1-releaseOz Linden
2013-05-07Automated merge with ↵Dave Parks
https://bitbucket.org/lindenlab/viewer-development-materials
2013-05-07Added tag 3.5.2-beta3 for changeset b6a4ac8f1916Oz Linden
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-07Fix for bad light map generation/sampling.Dave Parks
2013-05-07NORSPEC-119 another attempt at individual faces edits without side-effectsGraham 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-07tag merge of DRTVWR-299Oz Linden
2013-05-07NORSPEC-51 Fix (additional) Added missing imagecallum_linden
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-162 Fix for objects with materials set ignoring "tranparency %" value.Dave Parks
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-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-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-03Merge with headcallum_linden