summaryrefslogtreecommitdiff
path: root/indra/newview
AgeCommit message (Collapse)Author
2014-01-14Some cleanup of string to wstring conversion and vice versa.Aura Linden
2014-01-10Merge after backoutsimon
2014-01-10Revert earlier back-out for MAINT-535 ... it's back insimon
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-09Merge 3.6.14 from releasesimon
2014-01-08merge changes for 3.6.13-releaseOz Linden
2014-01-08increment viewer version to 3.6.14Oz Linden
2014-01-07Revert changes made for MAINT-535 to test in a release cohort.simon
2014-01-07merge changes for Snowstorm fall contributionsOz Linden
2014-01-07merge changes for storm-1980Oz Linden
2014-01-04STORM-1980 Center floater on screen. Tweak shaking parameters.Jonathan Yap
2014-01-03change shaking to decay exponentiallyOz Linden
2014-01-03STORM-1980 Small optimization and tweaks of shaking constantsJonathan Yap
2014-01-03STORM-1980 Add shake effectJonathan Yap
2014-01-03merge changes for 3.6.12-releaseOz Linden
2014-01-02increment version to 3.7.0Oz Linden
2014-01-02merge changes for 3.6.12-releaseOz Linden
2014-01-02STORM-1980 Remove callback in destructor.Jonathan Yap
Shrink floater and add a "!" icon in the top left corner.
2013-12-19merge changes from project qa viewerOz Linden
2013-12-19merge addition of LLAgent::removeRegionChangeCallbackOz Linden
2013-12-18STORM-1980: set new region restart sound uuidOz Linden
2013-12-18STORM-1831 Changing addRegionChangedCallback to more closely resemble the ↵Ima Mechanique
feature it replaces. This fixes the crashes reported by Whirly ;-)
2013-12-17add LLAgent::removeRegionChangedCallbackOz Linden
2013-12-17merge changes for open-113Oz Linden
2013-12-17merge changes for 3.6.12-releaseOz Linden
2013-12-16merge changes for storm-1993Oz Linden
2013-12-16merge changes for storm-1992Oz Linden
2013-12-16merge changes for storm-1989Oz Linden
2013-12-16merge changes for storm-1987Oz Linden
2013-12-16merge changes for storm-1986Oz Linden
2013-12-16merge changes for storm-1981Oz Linden
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-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-09Pulled viewer-releaseAura 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-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-04Removed debugging code.Aura Linden
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-03Creating a cleaner branchAura Linden