summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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-08Added tag 3.6.13-release for changeset 0d9b9e50f1a8Oz Linden
2014-01-08STORM-68 Remove obsolete note. Refactor a few blocks of code to not have ↵Jonathan Yap
early returns
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-07merge changes for 3.6.12-releaseOz Linden
2014-01-04STORM-1980 Center floater on screen. Tweak shaking parameters.Jonathan Yap
2014-01-04MergeIma Mechanique
2014-01-04storm-1831 In the LLSD, functions are in a <map> which makes sorting ↵Ima Mechanique
unnecessary (loading sorts them).
2014-01-04STORM-1831/STORM-2000 Changing LSL syntax schema to contain arguments in an ↵Ima Mechanique
array instead of a map element.
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-02correct mergeOz 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 for 3.6.12-releaseOz Linden
2013-12-19merge changes from project qa viewerOz Linden
2013-12-19merge addition of LLAgent::removeRegionChangeCallbackOz Linden
2013-12-19clean up audio engine loggingOz Linden
2013-12-19Fixing loading of default keywords file when nothing has been previously loaded.Ima Mechanique
2013-12-18merging back transplanted changesetsOz Linden
2013-12-18improve build.sh searches for additional package installersOz 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-18STORM-1831 Changing addRegionChangedCallback to more closely resemble the ↵Ima Mechanique
feature it replaces. This fixes the crashes reported by Whirly ;-)
2013-12-17add "A" test channel packageOz Linden
2013-12-17Fixing some BOOL to bool and changing one function to voidIma Mechanique
2013-12-17add LLAgent::removeRegionChangedCallbackOz Linden
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-12merge changes for 3.6.12-releaseOz Linden
2013-12-12STORM-68 Remove Apply buttonJonathan Yap
Add menu entry to Build->Options->Set Default Permissions... Disable Preferences->Advanced->Default Creation Permissions button when on login screen Add code for a one-time conversion from the old upload settings XML cleanup
2013-12-12STORM-68 Fix bug for new gestures, notecards, and scripts where a copied ↵Jonathan Yap
item did not preserve its default permissions. Add apply button.
2013-12-12MAINT-3541 (crash in std::vector >::reserve)MaximB ProductEngine