summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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-14Fix the viewer bundle version not being set appropriately.Geenz
2013-05-14Fix incorrect generation of Info.plist. Use a custom Info.plist template here.Geenz
2013-05-13Automated merge with ↵Dave Parks
https://bitbucket.org/lindenlab/viewer-development-materials
2013-05-13Merged with https://bitbucket.org/lindenlab/viewer-betaGeenz
2013-05-13Merge. Pull a fix from viewer-cat that went in after last merge.Monty Brandenberg
2013-05-13Added IME input window white list.Geenz
2013-05-13De-bork the viewer merge, causing black in-world images. Reviewed by Kellysimon
2013-05-13STORM-1948 - Fix for Set home to here - screen_home.bmp not savedCinders
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-14CHUI-958 FIXED Log spam: "drawtext: Ran off Segmentation End" and To field ↵maksymsproductengine
in nearby chat blank when selected
2013-05-13NORSPEC-177 Add glare to transparent surfaces.Dave Parks
2013-05-13BUILDFIX: potential fix for linux buildRichard Linden
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-13SH-3931 WIP Interesting: Add graphs to visualize scene load metricsRichard Linden
improved precision of scene diff log output
2013-05-13NORSPEC-173 Fix for mac buildDave Parks
2013-05-13SH-3931 WIP Interesting: Add graphs to visualize scene load metricsRichard Linden
added log output for scene monitoring
2013-05-13NORSPEC-171 Fix for full bright checkbox breaking transparent objects with ↵Dave Parks
materials set.
2013-05-13Automated merge with ssh://hg.lindenlab.com/richard/viewer-interestingXiaohong Bao
2013-05-13Automated merge with ↵Dave Parks
https://bitbucket.org/lindenlab/viewer-development-materials
2013-05-13CHUI-944 FIXED Show Voice indicator for P2P torn off conversations.Mnikolenko ProductEngine
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-10BUILDFIX - bad logic in scene monitor frame recordingRichard Linden
2013-05-10SH-3931 WIP Interesting: Add graphs to visualize scene load metricsRichard Linden
renamed LLView::handleVisibilityChange to onVisibilityChange to reflect standard naming conventions for handlers vs. reactors
2013-05-10SH-3931 WIP Interesting: Add graphs to visualize scene load metricsRichard Linden
renamed LLView::handleVisibilityChange to onVisibilityChange to reflect standard naming conventions for handlers vs. reactors
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