summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2013-09-26SH-3455 WIP - removed llagentwearablesfetch files, among other changesBrad Payne (Vir Linden)
2013-09-26SH-3455 WIPBrad Payne (Vir Linden)
2013-09-26Merge lion to get Mac fixGraham Linden
2013-09-26MergeGraham Linden
2013-09-26Last minute suggestions for IvyBridge Intel 2500 and nVidia 400 series ↵Graham Linden
expected GL settings from TankMaster Finesmith
2013-09-26Merge lion for good measureGraham Linden
2013-09-26Merge viewer-bear maint RC changes to get this build closer to the RC it ↵Graham Linden
will follow
2013-09-26NORSPEC-281 bring back a classic normal generation fix from runitai's ↵Graham Linden
personal collection
2013-09-26Try all you want multichar constant, but you'll never be a string to me! ↵Graham Madarasz (Graham Linden)
(fix mac build errors from 'curious' filepicker literals)
2013-09-26NORSPEC-259 revive fix stomped with materials->bear mergeGraham Linden
2013-09-26NORSPEC-259 revive fix stomped with materials->bear mergeGraham Linden
2013-09-25BUG-3984 fix broken rendering of particles using blend funcsGraham Linden
2013-09-25BUG-3984 fix broken rendering of particles using blend funcsGraham Linden
2013-09-25Fix decl of merged genBBoxes func to match merge implGraham Linden
2013-09-25Merge recent viewer-bear fixes that missed the boatGraham Linden
2013-09-25BUG-3982 add code to subtract the lack of not removing the removal of ↵Graham Linden
backfaces for particles (make particles render double-sided again)
2013-09-25SH-3455 WIP - moved setAvatarObject() to run after the self av constructor. ↵Brad Payne (Vir Linden)
Disabled sendAgentWearablesUpdate.
2013-09-24SH-2728 SH-4010 FIX pants flare issuesNyx Linden
When wearing multiple layers of pants, the morph masks for all layers would be composited, resulting in the smallest intersection of all layers. Instead we should only be applying the top layer. This change will affect all consumers of the llappearance library.
2013-09-24SH-3455 WIP - removed some handling for appearance version < 1Brad Payne (Vir Linden)
2013-09-24SH-3690 SH-4505 Cleanup pass through code.Monty Brandenberg
Start using DNS cache in legacy LLCurl code. Go to 15 seconds particularly as we're using threaded resolver at this point. Documentation cleanup. Add libcurl status checking and logging for curl_easy_setopt() operations that fail. Shouldn't happen and we'll just continue anyway but there's info in the logs to track these down now. Cleaned up logic around FASTTIMER enable defines used to evaluate pipeline stalls in main thread. Removed long-standing thread race around caps strings and URL construction. Not a significant risk but refactoring the code to get rid of them removed one huge eyesore. It can be made even slicker if desired (see notes).
2013-09-24merge more changes for CHOP-985Oz Linden
2013-09-24merge fixBrad Payne (Vir Linden)
2013-09-24mergeBrad Payne (Vir Linden)
2013-09-23Automated merge with https://bitbucket.org/lindenlab/sunshine-internalXiaohong Bao
2013-09-23fix the bug that texture aux channel data can not be reloaded.Xiaohong Bao
2013-09-23SH-3455 WIP - post-SSA cleanupBrad Payne (Vir Linden)
2013-09-23NORSPEC-285 fix merge error with attenuation on alpha masquerading as this ↵Graham Linden
norspec from wayback
2013-09-23SH-3455 WIP - post-SSA cleanupBrad Payne (Vir Linden)
2013-09-23SH-3455 WIP - post-SSA cleanup, including removal of mUseServerBakes and ↵Brad Payne (Vir Linden)
related methods
2013-09-23MAINT-3179 fix bad indexing of position info generating false alarms on ↵Graham Linden
range checks, issue with free of data now allocated contig with positions instead, and added copious amounts of llwarns to error return sites so 'invalid element' will be a reason to read the log and not a tease.
2013-09-23made change to include channel name in the settings_install.xml file ↵JJ Linden
generated. changed so that sourceid is not part of a list of options pulled into that file, along with the channel
2013-09-23SH-3455 WIP - post-SSA cleanupBrad Payne (Vir Linden)
2013-09-23mergeMaximB ProductEngine
2013-09-23MAINT-3159 FIXED Disable buttons when refreshing ui.Mnikolenko ProductEngine
2013-09-23MAINT-3151 (Issue with urls being autoclicked when holding left click into ↵MaximB ProductEngine
an unfocused textbox then dragging pointer over a url and releasing.)
2013-09-20MergeGraham Linden
2013-09-20MAINT-3172 fix rendering regressions from release mergedownGraham Linden
2013-09-20Fix AvatarRenderInfo cap broken in merge, add a new diagnostic log messagesimon
2013-09-20ACME-902: Link the '?' button to the proper viewer-help article or articlesGilbert Gonzales
2013-09-20STORM-1950 more suggestions from TankMasker Finesmith about not including ↵Graham Linden
SandyBridge Intel GPUs in driver nagging and updating the expected GL version for 500 series or better nV to get 327.23 driver nagging
2013-09-20mergeNyx Linden
2013-09-20SH-3943 FIX beard morph masks applied inconsistently on login to server bake ↵Nyx Linden
region Looks like we were caching bad morph masks that were generated on login. Adjusting algorithms to always replace the cache when we have invalidated the other channels of the baked texture.
2013-09-20NORSPEC-366 fix regression on 10.6.8 Mac only from release to bear mergeGraham Linden
2013-09-20NORSPEC-292 fix regression of materials bug from mismerge of release to bearGraham Linden
2013-09-20Move from std::queue to std::list which has betterMonty Brandenberg
behavior and swap() as well. Should probably do this for the other queues at some point.
2013-09-20Used a c++11 feature unintentionally. Use a moreMonty Brandenberg
traditional swap-less object transfer.
2013-09-19Merge 3.6.6 Materials RC and update Intel HD gpu_table entries to expect GL ↵Graham Linden
4.2 to nag resis to get the fixed Intel driver
2013-09-19SH-4516 Fix a subset of thread races in llmeshrepositoryMonty Brandenberg
Much earlier identified some thread races including two on mskininfoq and mdecompositionq. I actually hit one in testing the other day so I'm fixing them now. Put them under the mMutex lock and use the mutex in such a way that main thread stalls are not added.
2013-09-19Merge downstream codesimon_linden
2013-09-19SH-3455 WIP - removing bake upload codeBrad Payne (Vir Linden)