summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-05-16NORSPEC-185 Fix for regression caused by accidentally checking in debug code.Dave Parks
2013-05-16Mergecallum_linden
2013-05-16merge changes for 3.5.3-beta6Oz Linden
2013-05-16Removed debugging.Aura Linden
2013-05-15updated BuildParams to try to fix windows build issueJJ Linden
2013-05-15Thanks mercurial.Aura 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-15Added tag 3.5.2-beta6 for changeset 9013c07bfe1cOz Linden
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-15merged in branch for changing BuildParamsJJ Linden
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-15turned off distcc for linux buildsJJ Linden
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-15Mergesimon
2013-05-15BUG-2581 : [simon-ll-viewer-cat] Path cut, hollow and slice break planarsimon
texture mapping on prims. Credits to DaveP
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-15CHUI-945 FIXED Add Object IMs to Chat Notification PreferencesPavelK ProductEngine
2013-05-20CHUI-953 FIXED Set dnd and close all conversation before quittinq.Mnikolenko ProductEngine
2013-05-17CHUI-959 FIXED Resident picker allowed to open behind fui toolbarsmaksymsproductengine
2013-05-17mergemberezhnoy
2013-05-16CHUI-913 Additional fixMnikolenko ProductEngine
2013-05-16CHUI-963 (Toggling chat fui button twice tears off nearby chat to lower left ↵mberezhnoy
corner also deletes other open conversations)
2013-05-15CHUI-913 FIXED Show toasts for torn-off windows that aren't collapsed.Mnikolenko ProductEngine
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-14SH-4190 Reactivate unit tests neutered under MAINT-3202Monty Brandenberg
HttpStatus unit tests have never caused a unit test failure but they do have the word 'error' in their text descriptions which gets picked up by the log processor in TC builds. So, reactivate the tests and reform the descriptions.
2013-05-14NORSPEC-102 & Co ReloadedKitty Barnett
2013-05-14Merge. Refresh from viewer-cat after it pulled viewer-beta.Monty Brandenberg
2013-05-14Automated merge with ↵Dave Parks
https://bitbucket.org/lindenlab/viewer-development-materials
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-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