summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2014-03-10DD-17 : WIP : some work on the suffix for Listing foldersMerov Linden
2014-03-10DD-3 : WIP : Add test data to LLMarketplaceData when opening the floater for ↵Merov Linden
the first time
2014-03-07DD-2 : Implement LLMarketplaceTuple and LLMarketplaceDataMerov Linden
2014-03-06DD-7 : Initialize the Merchant Items floater checking the is a Merchant ↵Merov Linden
status correctly. No indication it's initializing (UI) but the code works
2014-03-06DD-4, DD-5, DD-6, DD-7, DD-8: WIP : Add Merchant Items panel and make it ↵Merov Linden
somewhat work, in a clunky sort of way
2014-03-04Pull merge from viewer-maint-2287 aka Merchant OutboxMerov Linden
2014-02-24increment viewer version to 3.7.3Oz Linden
2014-02-17Pull merge from lindenlab/viewer-releaseMerov Linden
2014-02-14Merge. Refresh from viewer-release after 3.7.1 release.Monty Brandenberg
2014-02-14increment viewer version to 3.7.2Oz Linden
2014-02-11Merge. Refresh from viewer-release after 3.7.0 releaseMonty Brandenberg
2014-02-10Pull merge from lindenlab/viewer-releaseMerov Linden
2014-02-11Hack to fix ACME-1317Cho
2014-02-10increment viewer version to 3.7.1Oz Linden
2014-01-30fix odd editor artifactOz Linden
2014-01-30Another build triggerMonty Brandenberg
2014-01-29FITMESH-6: correct bounds checkingOz Linden
2014-01-29another trigger editMonty Brandenberg
2014-01-27Trivial edit to stimulate a new build.Monty Brandenberg
2014-01-24merge fix to the codesign fixOz Linden
2014-01-24fix error message python boo-booOz Linden
2014-01-24merge workaround for build farm Mac code signing failuresOz Linden
2014-01-23FITMESH-6, FITMESH-20 Fix for some objects disappearing when hardware ↵Dave Parks
skinning enabled and ALM disabled.
2014-01-22add retries around OSX codesign to try to work around frequent build farm ↵Oz Linden
failures
2014-01-13Pull merge from lindenlab/viewer-releasemerov
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-08merge changes for 3.6.13-releaseOz Linden
2014-01-08increment viewer version to 3.6.14Oz Linden
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-19clean up audio engine loggingOz 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