summaryrefslogtreecommitdiff
path: root/indra/newview
AgeCommit message (Collapse)Author
2013-05-16merge changes for 3.5.3-beta6Oz Linden
2013-05-15NORSPEC-119 put back TE-specific get registration in material manager ↵Graham Madarasz
stomped during 'reloading'.
2013-05-15MergeGraham Madarasz
2013-05-15Attempt at making deferred rendering work on OpenGL 2.1Dave Parks
2013-05-15MergeGraham Madarasz
2013-05-15NORSPEC-152 better default norm/spec textures which read better in the UI ↵Graham Madarasz
and provide better default spec feedback
2013-05-15merge up to latest integration repoOz Linden
2013-05-15NORSPEC-175 Force "alpha mode" to blend in UI when transparency is above zeroDave Parks
2013-05-15Mergecallum_linden
2013-05-15NORSPEC-132 Fix (again) Rotation degree has range -9999.00..9999.00callum_linden
2013-05-15MAINT-2665: fix crashes being counted as wrong type in last_exec_event due ↵Oz Linden
to log macro wrapper
2013-05-15NORSPEC-183 fix regression in diff map blank texture from NSPEC 152 fix by ↵Graham Madarasz
forcing new BlankImageID to the old default
2013-05-14NORSPEC-103 added new shaders for using norm/spec TCs in overlayGraham Madarasz
2013-05-14MergeGraham Madarasz
2013-05-14NORSPEC-103 reflect normal/spec UVs in face edit overlay displayGraham Madarasz
2013-05-14NORSPEC-181 Fix for performance regression.Dave Parks
2013-05-14ACME-324 Populate list with FB only friends: Fixed a bug that was causing ↵Gilbert Gonzales
FB+SL friends to appear within the 'Invite people you know to Second Life' tab.
2013-05-14NORSPEC-102 & Co ReloadedKitty Barnett
2013-05-14Automated merge with ↵Dave Parks
https://bitbucket.org/lindenlab/viewer-development-materials
2013-05-14NORSPEC-85 fix default normal vert offsetGraham Madarasz
2013-05-14NORSPEC-151 NORSPEC-152 fix handling of disable of bumpy and shiny in ↵Graham Madarasz
graphics panel to also disable deferred properly and add hooks for default norm and spec textures in texture picker
2013-05-13Automated merge with ↵Dave Parks
https://bitbucket.org/lindenlab/viewer-development-materials
2013-05-13ACME-344 : Menu hooked up. Readded the missing completedHeader() methods in ↵Merov Linden
responder that I mistakenly took out during the refactor.
2013-05-13NORSPEC-177 Add glare to transparent surfaces.Dave Parks
2013-05-13NORSPEC-178 NORSPEC-179 NORSPEC-180 made enable/disable handling more ↵Graham Madarasz
consistent and increased max range on repeats per meter
2013-05-13NORSPEC-173 Fix for mac buildDave Parks
2013-05-13NORSPEC-171 Fix for full bright checkbox breaking transparent objects with ↵Dave Parks
materials set.
2013-05-13Automated merge with ↵Dave Parks
https://bitbucket.org/lindenlab/viewer-development-materials
2013-05-12LLMaterialMgr::get() doesn't handle a callback request for LLMaterialID::nullKitty Barnett
2013-05-12Avoid code duplication in LLMaterialMgrKitty Barnett
2013-05-12Refactor LLPanelFace to make it clearer that the material is a property of ↵Kitty Barnett
the face(s) and never the panel
2013-05-11Merge viewer-dev-materials and bugfix in LLPanelFace::getState using ↵Graham Madarasz
material instead of mMaterial
2013-05-11Fix many issues with selection misapplication and rendering not matching ↵Graham Madarasz
applied materials
2013-05-11increment version to 3.5.3Oz Linden
2013-05-11merge latest integration repo changesOz Linden
2013-05-11Merge vwr-dev-matGraham Madarasz
2013-05-10Pull merge from viewer-fbcMerov Linden
2013-05-10ACME-348 : Completed : Facebook Connect refactored, LLPeoplePanel test list ↵Merov Linden
hooked correctly.
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-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-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.