summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2013-12-16merge changes for storm-1981Oz Linden
2013-12-12MAINT-3541 (crash in std::vector >::reserve)MaximB ProductEngine
2013-12-11MAINT-3575: remove old exe if found in current install directoryOz Linden
2013-12-11removing of dos line endingmaksymsproductengine
2013-12-11OPEN-113 Use better way of testing for stub that will not impact TPVs.Jonathan Yap
2013-12-11Workaround for MAINT 3099: remove any Vivox log file left in the program folderOz Linden
2013-12-11OPEN-113 Build > Upload > Model > Calculate weights & fee is not disabled in ↵Jonathan Yap
OS built viewers
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-11MAINT-3553 Another checking is added to avoid possible crash.Mnikolenko ProductEngine
2013-12-10Re-fix merge issue that removed "AvatarRenderInfo" cap usagesimon
2013-12-10MAINT-3571: include settings_install.xml whether it contains settings or notOz Linden
2013-12-10Pull merge from lindenlab/viewer-releaseMerov 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-09MAINT-3539 Additional checking was added to avoid possible crash.Mnikolenko ProductEngine
2013-12-06MAINT-3552: crash in LLPanel::getString: Failed to find string ↵simon
ErrorFetchingServerReleaseNotesURL in panel floater_about
2013-12-09Merge latest viewer release for 3.6.13simon
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-04STORM-1993 In the About Land floater only send object return time to server ↵Jonathan Yap
when it has been changed
2013-12-04STORM-1992 'Open voice connection' and 'Expand participant list' buttons are ↵Jonathan Yap
overlapping each other in IM conversation after resizing.
2013-12-03Automated merge with http://bitbucket.org/nat_linden/viewer-maint-3489Nat Goodspeed
2013-12-03Update based on first project viewer tests.Oz Linden
Two more bones to better address back deformation: UPPER_BACK and LOWER_BACK Better deformation for breasts, belly, upper and lower back (seen using the Body Fat and Belly Size sliders) Minor tweaks in the avatar_lad.xml file for a few other minor shapes. Small typo bug (FITMESH-2) Updated rigs and corrected female mesh Removed skeleton-only files so that people all start from the same base meshes with example skinning These updates specifically address the following bugs: FITMESH-2, FITMESH-4, FITMESH-5, FITMESH-7, FITMESH-10 (.ma formats, not .dae)
2013-12-03STORM-1989 Overlapping UI elements in Upload Model floaterJonathan Yap
2013-11-27ACME-1221 : Do not clear merchant import cookie on 404, happens to newly ↵Merov Linden
minted merchants
2013-11-27merge changes for storm-1987Oz Linden
2013-11-27STORM-1986 Eliminated early return per code reviewJonathan Yap
2013-11-27STORM-1987 Inconsistent menu naming and behavior in Places floaterJonathan Yap
2013-11-26ACME-1220 : Fixed. Do not accumulate callbacks when reinitializing market placeMerov Linden
2013-11-26STORM-1986 Added right click Show on Map context menu for Inventory floater ↵Jonathan Yap
landmarks Possible fix for BUG-4593
2013-11-26MAINT-3319 : Fix the purge of descendents of a category. Note: the cached ↵Merov Linden
number of descendents is not always reliable
2013-11-26merge changes for storm-1984Oz Linden
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-26merge fix for STORM-1984Oz Linden
2013-11-26remove excessively complex fixes for MAINT-2914 and MAINT-3142Oz Linden
2013-11-26ACME-3320 : Clearing deleted categories so not to pool on them foreverMerov Linden
2013-11-26STORM-1981 Eliminate beam spreadingJonathan Yap
2013-11-26MAINT-3489: Make Mac updater script detect prematurely deleted .dmg.Nat Goodspeed
Also, delete it when done.
2013-11-25MAINT-3320 : Make inbox (Received Items) more resilients to deletion while ↵Merov Linden
we're at it
2013-11-25remove obsolete INSTFLAGS references from installerOz Linden
2013-11-25Merge last changes for DRTVWR-345simon
2013-11-25STORM-1981 Make pulse operate properly in both directions.Jonathan Yap
Move duplicated common code into its own function.
2013-11-25mergeMaximB ProductEngine
2013-11-25MAINT-3499 FIXED Region Debug Console is broken after resizemaksymsproductengine
2013-11-25Merge. Refresh from viewer-release after 3.6.11 release.Monty Brandenberg
2013-11-25Merge - doh!simon
2013-11-24STORM-1981 Rough initial changes for evaluation purposes.Jonathan Yap
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-22ACME-1219 : Fix crash on exit on Windows 7merov