summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2014-01-27Trivial edit to stimulate a new build.Monty Brandenberg
2014-01-09Merge. Refresh from viewer-release after 3.6.13 release.Monty Brandenberg
2014-01-09SH-4667 HTTP Viewer reports network error instead of a misnamed joint on ↵Monty Brandenberg
mesh upload Tried to add consistent mesh upload retries in the HTTP work but a combination of bad status choices in the upload service and the one-shot nature of the upload capabilities means that status information can be lost. For now, retain the wonderful manual retry logic. At some future point, we might fix the services or add application-level retry.
2014-01-08increment viewer version to 3.6.14Oz Linden
2013-12-11MAINT-3575: remove old exe if found in current install directoryOz Linden
2013-12-11Workaround for MAINT 3099: remove any Vivox log file left in the program folderOz Linden
2013-12-11BUG-4685: remove any SecondLife.exe file left in the SecondLifeViewer folder ↵Oz Linden
by an install prior to 3.12
2013-12-10MAINT-3571: include settings_install.xml whether it contains settings or notOz Linden
2013-12-09Merge. Refresh from viewer-release after 3.6.12 release.Monty Brandenberg
2013-12-09increment viewer version to 3.6.13Oz Linden
2013-12-06SH-4645 Viewer hangs on exit after cancelling a mesh upload.Monty Brandenberg
Problem involved a 3-way livelock between the main, upload and decomposition threads. Viewer is shutting down but an upload is in the 'generate hulls' state. Main thread asks upload request to discard and spins waiting for it to finish. Upload thread is in generateHulls spinning waiting for the decomposition thread to process a mesh request. Decomposition thread is sleeping waiting for main thread to deliver work that upload thread has asked the decomposition thread to do.
2013-12-05Merge. Refresh from lli/monty_viewer-drano-http-3 in preparation for IQA fixes.Monty Brandenberg
2013-12-03Automated merge with http://bitbucket.org/nat_linden/viewer-maint-3489Nat Goodspeed
2013-11-26MAINT-3489: Gracefully handle missing downloaded installer file.Nat Goodspeed
If a marker file indicates that an installer has been downloaded and verified and is ready to install, but that installer file does not exist, log it and revert to checking for update. Also add logging to every code path that can remove the installer explicitly, in case the missing installer is actually being killed off by some weird sequence of state-machine transitions.
2013-11-26MAINT-3489: Make Mac updater script detect prematurely deleted .dmg.Nat Goodspeed
Also, delete it when done.
2013-11-25remove obsolete INSTFLAGS references from installerOz Linden
2013-11-25Merge. Refresh from viewer-release after 3.6.11 release.Monty Brandenberg
2013-11-24move setting default grid to settings_install.xml so that it works on all ↵Oz Linden
platforms
2013-11-24normalize format of and add arch to all installer namesOz Linden
2013-11-21increment viewer version to 3.6.12Oz Linden
2013-11-18Code review updates. All comments so far.Monty Brandenberg
2013-11-12Merge. Refresh from viewer-release after 3.6.10 releaseMonty Brandenberg
2013-11-11Merge 3.6.11 for RC-abilityGraham Linden
2013-11-11convert dos line endingsOz Linden
2013-11-11increment viewer version to 3.6.11Oz Linden
2013-11-08MAINT-3412 Fix Intel Iris recognizer to include optional Pro as is reported ↵Graham Linden
with integrated-only graphics on new MBP
2013-11-07DRTVWR-338 Make an inocuous change to get a new build number out of TeamCityDave Parks
2013-11-05Shot in the dark patch for MAINT-3353 backported from viewer-tigerAura Linden
2013-11-05MAINT-3376 FIXED Successive llSetTextureAnim calls fail in 3.6.10 (283075) ↵maksymsproductengine
unless a different command (llSleep(0.01), llSay(0,"hello")) is placed between them.: - fix for MAINT-2861 was reverted to resolve this issue;
2013-11-01BUG-4286 add AMD R7/R9 entried to GPU tableGraham Linden
2013-10-28Pull merge from lindenlab/viewer-fbcMerov Linden
2013-10-28ACME-1099 : Fix crash when getting the Facebook cap from a (potentially ↵Merov Linden
null) region
2013-10-28Automated merge with http://bitbucket.org/nat_linden/viewer-maint-3331Nat Goodspeed
2013-10-28MAINT-3343 FIXED Expand/Collapse message pan only on left click.Mnikolenko ProductEngine
2013-10-25Fix release merge issues (included upstream changes not yet in release from ↵Graham Linden
bear)
2013-10-25MAINT-3356 GPU Table update to support Retina MBP 'Intel Iris OpenGL Engine' ↵Graham Linden
driver id on Mavericks.
2013-10-25Merge 3.6.9 ShareStormGraham Linden
2013-10-23increment viewer version to 3.6.10Oz Linden
2013-10-22MAINT-3331: On update, remove com.secondlife.indra.viewer.savedState.Nat Goodspeed
2013-10-17Merge. Pull in viewer-release after 3.6.8 fixes for AMD graphics.Monty Brandenberg
2013-10-17Pull merge from oz_linden/336-snowstormMerov Linden
2013-10-16Fix merge error in llvoavatarGraham Linden
2013-10-16Merge 3.6.8Graham Linden
2013-10-16Merged 3.6.8-releaseScott Lawrence
2013-10-16Merged 3.6.8-releaseScott Lawrence
2013-10-16increment viewer version to 3.6.9oz@lindenlab.com
2013-10-15merge changes for DRTVWR-336Oz Linden
2013-10-11MAINT-2968 Transplant cleanup.Dave Parks
2013-10-10MAINT-2968 Fix for crash on AMD hardware running current drivers.Dave Parks
2013-10-04Convert one more unit test over to improved waiting scheme to avoid build ↵Monty Brandenberg
failures.
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-10 19:57:43 +0000