summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2014-02-10Merge viewer-releasesimon
2014-02-10MAINT-3710 FIXED List of members is removed from General tab. Title column ↵Mnikolenko ProductEngine
is added to the list in Members tab. Roles tab is renamed to Roles & Members and Roles sub-tab is default now.
2014-01-31merge workaround for Mac codesign errors in build farmOz Linden
2014-01-31merge changes for storm-2011Oz Linden
2014-01-30fix odd editor artifactOz Linden
2014-01-30Another build triggerMonty Brandenberg
2014-01-29FITMESH-6: correct bounds checkingOz Linden
2014-01-29STORM-2010: fix to AutoAcceptNewInventoryOz Linden
2014-01-29another trigger editMonty Brandenberg
2014-01-28STORM-2011: Group member lists not loading properlyAnsariel
2014-01-27Trivial edit to stimulate a new build.Monty Brandenberg
2014-01-27MAINT-3657 FIXED Don't change state when other user declines call.Mnikolenko ProductEngine
2014-01-26typo. Yay.Aura Linden
2014-01-26Debug removal.Aura Linden
2014-01-26Warn treated as error kills TS film at 11Aura Linden
2014-01-26Merged.Aura Linden
2014-01-26Was not using correct name for results of file search.obscurestar
2014-01-24merge fix to the codesign fixOz Linden
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 codesign failuresOz Linden
2014-01-24merge workaround for build farm Mac code signing failuresOz Linden
2014-01-24merge changes for MAINT-3187Oz Linden
2014-01-23Debugging changes. fixed broken pipe.Aura Linden
2014-01-23FITMESH-6, FITMESH-20 Fix for some objects disappearing when hardware ↵Dave Parks
skinning enabled and ALM disabled.
2014-01-23correct coding style problems, add contribution creditOz Linden
2014-01-23merge changes for 3.6.13-releaseOz Linden
2014-01-22merge changes for storm-1972Oz Linden
2014-01-22add retries around OSX codesign to try to work around frequent build farm ↵Oz Linden
failures
2014-01-22Removed debug line.Aura Linden
2014-01-22char vs wchar_t FIGHTAura Linden
2014-01-21Heavy-handed attempt at fixing crashandloop hang.Aura Linden
2014-01-21MAINT-3187: Name list controls do not properly resolve avatar namesAnsariel
2014-01-18Fixed: BUG-4413LanceCorrimal
2014-01-17MAINT-3536 FIXED new crash in XML_ParserFree: temporary solutionmaksymsproductengine
2014-01-16Pulled merge from viewer-release.Aura Linden
2014-01-16What passess in MSVC may not pass in Teamcity.Aura Linden
2014-01-16Fixed syntax issue that was wrapped in #if that didn't get hit until we got ↵Aura Linden
to teamcity. oops.
2014-01-15Fixes from Windows build including utf-16 to utf-8 conversions.Aura Linden
2014-01-15MAINT-3397 : fix to use slurl for localization handler for ↵simon
EstateManagerFailedllTeleportHome message
2014-01-14Some cleanup of string to wstring conversion and vice versa.Aura Linden
2014-01-14STORM-2007 Buy floater displays truncated names/permissions when object is ↵Jonathan Yap
set to sell original and sell copy.
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-08STORM-68 Remove obsolete note. Refactor a few blocks of code to not have ↵Jonathan Yap
early returns