summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2015-03-10MAINT-147 FIXED Allow follow cam scripts after closing Build tools floater.Mnikolenko ProductEngine
2015-03-09SL-103 WIP - fix for some inventory items not enabling addBrad Payne (Vir Linden)
2015-03-09SL-103 WIP - bumped MAX_CLOTHING_LAYERS to target value of 60Brad Payne (Vir Linden)
2015-03-06SL-103 WIP - commentBrad Payne (Vir Linden)
2015-03-06SL-103 WIP - comment re: possible future workBrad Payne (Vir Linden)
2015-03-06MAINT-4967 FIX - log spam removedBrad Payne (Vir Linden)
2015-03-05DD-339 : Adding loading indicator to marketplace floater when the listings ↵Merov Linden
data and inventory data are being fetched
2015-03-05Simplify CMake code to generate viewer_version.txt and summary.json.Nat Goodspeed
The quoting used for the cygwin printf command didn't work for 'cmake -E echo'. The whole content was enclosed in single quotes, with individual string elements enclosed in double quotes. But we ended up with a summary.json containing (e.g.): '{Type:viewer,Version:3.7.26.33262}' instead of the desired: {"Type":"viewer","Version":"3.7.26.33262"} HOWEVER: I see no compelling reason why either of these files must be deferred to build time. It's simpler and more robust to generate them both directly from CMake at configure time.
2015-03-05SL-103 WIP - viewer enforces wearable limits based on total articles of ↵Brad Payne (Vir Linden)
clothing rather than per-type limit. Limit is artificially low for testing, will bump before release.
2015-03-05MAINT-4930 FIXED Fix viewer error checking for max-agent-groups in viewerandreykproductengine
2015-03-05Merge downstream code and become version 3.7.26simon
2015-03-05Merge viewer-release and become version 3.7.26simon
2015-03-05MAINT-4874 FIXED Actions that require a double click "randomly" fail - repro ↵andreykproductengine
& cause found for BUG-7753
2015-03-04MAINT-4858 FIXBrad Payne (Vir Linden)
2015-03-04MAINT-4943 FIXED Crash on locationruslantproductengine
2015-03-04MAINT-4943 FIXED Crash on locationruslantproductengine
2015-03-04MAINT-4169 ShowGreyQueryInUrls debug setting was removed and the grey part ↵Mnikolenko ProductEngine
of the link always appears.
2015-03-03Commit Callum's fix to eliminate dependency on cygwin printf.Nat Goodspeed
Use 'cmake -E echo' instead.
2015-03-03MAINT-4653 WIPBrad Payne (Vir Linden)
2015-03-02DD-329 : Do not update listing folders before the association is completedMerov Linden
2015-03-01MAINT-4839 FIXED Animation of Mesh Dress doesn't work.ruslantproductengine
MAINT-4165 FIXED Crash on skinned, texture animated geometry with deferred rendering enabled.
2015-03-04MAINT-4939 FIXED Remove Abuse Report Pop-Up Dialogandreykproductengine
2015-03-03MAINT-4897 FIXED Frequent error when texturing a linkset - "Unable to add ↵andreykproductengine
texture. Please wait a few seconds and try again."
2015-03-04MAINT-1961 FIXED Use "TextureLivePreview" setting by default, if mCanPreview ↵Mnikolenko ProductEngine
was not set manually.
2015-02-27Pull merge from lindenlab/viewer-releaseMerov Linden
2015-03-23correct merge errorOz Linden
2015-03-23merge changes for 3.7.26-releaseOz Linden
2015-02-27DRTVWR-397 - removed duplicate functionBrad Payne (Vir Linden)
2015-02-27MAINT-4918 WIP - batch up detach requests for objectsBrad Payne (Vir Linden)
2015-02-27MAINT-2781 FIXED Reset pressed state on focus lost.Mnikolenko ProductEngine
2015-02-27MAINT-4920 FIXED Reset mClickedInMouselook when left click handled by LLToolPie.Mnikolenko ProductEngine
2015-02-26MAINT-4904 FIXED Show confirmation pop-up before unlinking an object.Mnikolenko ProductEngine
2015-02-25mergeBrad Payne (Vir Linden)
2015-02-25mergeBrad Payne (Vir Linden)
2015-02-25MAINT-4918 WIPBrad Payne (Vir Linden)
2015-02-24Automated merge with ssh://bitbucket.org/lindenlab/viewer-releaseNat Goodspeed
2015-02-24MAINT-4917 WIP - batch COF link request before batch attachment request. ↵Brad Payne (Vir Linden)
Should only generate one bake request.
2015-02-24merge changes for 3.7.25-releaseOz Linden
2015-02-24increment viewer version to 3.7.26Oz Linden
2015-02-24MAINT-4872 FIXED wearables with same asset id are not swappedandreykproductengine
2015-02-24merge changes for MAINT-4790Oz Linden
2015-02-23MAINT-4329 FIXED LLImageRaw::scale() scales each image *twice* for no ↵ruslantproductengine
apparent reason Linux & OS X compile error fix
2015-02-23Backed out changeset: 81b8de17a195ruslantproductengine
2015-02-23MAINT-4329 FIXED LLImageRaw::scale() scales each image *twice* for no ↵ruslantproductengine
apparent reason Linux & OS X compile error fix
2015-02-23Backed out changeset: 4c24cfce033aruslantproductengine
2015-02-23MAINT-4329 FIXED LLImageRaw::scale() scales each image *twice* for no ↵ruslantproductengine
apparent reason Linux & OS X compile error fix
2015-02-21DD-335 : Improve the performance of Get listings by 400%, fix a bug when ↵Merov Linden
error occured on SLM
2015-02-20MAINT-4653, DRTVWR-397 WIP - more code for tracking attachment operations, ↵Brad Payne (Vir Linden)
smarter handling of multiple requests.
2015-02-20Fix merge errorsimon
2015-02-19Merge downstream codesimon