summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-05-14Fix EOL characterssimon
2013-05-14Merge downstream viewer-bear and viewer-betasimon
2013-05-14Merge in latest viewer-betasimon
2013-05-14MAINT-2302 Tests frequently fail on Windows builds.Monty Brandenberg
I'm calling this the more correct fix. The httprequest tests actually talk to an HTTP server running in the Python test scaffold script. Under severe CPU competition, it may not get the cycles needed to start up and make progress. So this modifies the test to spin a little faster and dwell waiting on the server for a longer period. Hope this will be adequate to make the tests reliable.
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-13Merge. Pull a fix from viewer-cat that went in after last merge.Monty Brandenberg
2013-05-13De-bork the viewer merge, causing black in-world images. Reviewed by Kellysimon
2013-05-13Merge. Refresh from /lindenlab/viewer-cat prior to pushing.Monty Brandenberg
2013-05-13Whinge reduction effort on the unit tests. Python 2.7 SocketServerMonty Brandenberg
library has new exception-throwing behavior when a client disconnects unannounced. Generally ignore exceptions as a result as we don't care about the server side. On HTTP trace-mode tests, spin a little faster and longer to give libcurl time to emit all the junk it wants to send us. Should reduce 'reasonable time' failures on tests <12> and <13>.
2013-05-13NORSPEC-177 Add glare to transparent surfaces.Dave Parks
2013-05-13CHOP-942: fix crash if update check times outOz Linden
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-12Merged with viewer-dev-materialsKitty Barnett
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-10Add BuildVersion.cmake to great chain of lifeGraham Madarasz
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-10NORSPEC-173 Shrink size of matrix palette for backwards compatibility.Dave Parks
2013-05-10MAINT-2672 Make windows flex/bison inputs identical to other platforms to ↵Graham Madarasz
make bison >= 2.7 work
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 with vwr-dev-matGraham Madarasz
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-10NORSPEC-102 Rapid materials updates are not smooth to viewer which is ↵Kitty Barnett
editing the object
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-09Mergesimon
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-09Added tag 3.5.2-beta4 for changeset a314f1c94374Oz Linden
2013-05-09Merge downstream code and viewer-betasimon
2013-05-09NORSPEC-170 make adv lighting checkbox reflect whether deferred shaders ↵Graham Madarasz
loaded successfully
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-19 17:10:23 +0000