summaryrefslogtreecommitdiff
path: root/indra/llrender
AgeCommit message (Collapse)Author
2014-12-15merge changes for 3.7.22-releaseOz Linden
2014-12-10Rename llround(..) to ll_round(..) because of a collision with MS llround ↵callum_linden
(long long round) in VS2013
2014-12-08mergeBrad Payne (Vir Linden)
2014-12-08Merge downstream code and become version 3.7.23simon
2014-12-02mergeBrad Payne (Vir Linden)
2014-12-01mergeBrad Payne (Vir Linden)
2014-12-01merge changes for 3.7.21 releaseOz Linden
2014-11-24Merge downstream code and become version 3.7.21simon
2014-11-18Fix for gpu_bench crash without parallels knock-onGraham Linden
2014-11-17Attempt wider disable of using profile API when timer query is not presentGraham Linden
2014-11-17Avoid using GL_ARB_timer_query functionality when not supported and protect ↵Graham Linden
against probably-not-NULL current bound shader pointer
2014-11-14Automated merge with ssh://bitbucket.org/lindenlab/viewer-releaseNat Goodspeed
2014-11-11Merge changes for 3.7.20-releasemaksymsproductengine
2014-11-10merge changes for 3.7.20-releaseOz Linden
2014-11-03MAINT-3585 FIXED Viewer Crashes when attempting to upload image.ruslantproductengine
The bug was fixed, the reasone of crash is following. The Core Flow view contain another GL context and will not care about restoring a previous. I restore context manually. This path also contain a minor changes in another files. All changes described here. Сhange's for fix current bug. indra/llwindow/llwindow.h indra/llwindow/llwindowheadless.h indra/llwindow/llwindowmacosx.h indra/llwindow/llwindowsdl.h indra/llwindow/llwindowwin32.h indra/newview/lllocalbitmaps.cpp indra/newview/llviewerdisplay.cpp indra/newview/llviewerdisplay.h Twice mUsage initialization (replace to forward initialization). indra/llcharacter/lljointstate.h Looks like condition should be befor memcopy call, otherwise - possible CRASH. indra/llcommon/llmd5.cpp Unused condition and variables. indra/llmath/llsphere.cpp Looks like should be under if otherwise - possible CRASH indra\llprimitive\llmodel.cpp Useless assert's. indra/llrender/llrender.cpp indra/newview/lldaycyclemanager.cpp
2014-10-17Update to build on Xcode 6.0: more removal of unused variables ↵callum_linden
[-Wunused-variable]
2014-10-14STORM-2080: correct fitted mesh rendering on some ATI cardsOz Linden
2014-10-13fixes for cmake warnings about policy changes. could not fully test these ↵JJ Linden
changes
2014-09-10MAINT-3964 FIXED Textures with Alpha won't Animate on Rigged Mesh when worn ↵ruslantproductengine
: fix in shader (mul texcoord to tex matrix), array's optimization
2014-06-19Automated merge with http://bitbucket.org/lindenlab/viewer-releaseDave Parks
2014-06-02Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-drtvwr-365.Stinson Linden
2014-05-13sunshine-external merge WIPBrad Payne (Vir Linden)
2014-05-08Correcting a build error with the release viewer.Stinson Linden
2014-04-28MAINT-4009: Ensuring that the pick mask for the LLImageGL is always properly ↵Stinson Linden
freed during its cleanup method.
2014-03-19MAINT-3131 Use benchmark to determine GPU class instead of GPU table.Dave Parks
2014-03-12mergeBrad Payne (Vir Linden)
2014-03-12merge with releaseRichard Linden
2014-02-12merge with releaseRichard Linden
2014-02-11mergeBrad Payne (Vir Linden)
2014-02-14More memory cleanup of containers after DeletePairedPointer() usage.simon
2014-02-10Merge viewer-releasesimon
2013-12-05mergeBrad Payne (Vir Linden)
2013-11-11Automated merge with http://bitbucket.org/lindenlab/viewer-releaseRichard Linden
2013-11-11merge 3.6.10-releaseOz Linden
2013-11-05fixed focus issue on inventoryRichard Linden
2013-10-30Merge downstream code from viewer-bearsimon
2013-10-30MAINT-3359 Don't check for LLGLSLShader::sNoFixedFunction as we don't want ↵Mnikolenko ProductEngine
to loose ui colours(depending on enabled/disabled basic shader).
2013-10-21MergeXiaohong Bao
2013-10-16mergeBrad Payne (Vir Linden)
2013-10-16mergeBrad Payne (Vir Linden)
2013-10-15renamed TimeBlock to BlockTimerStatHandleRichard Linden
2013-10-14changed ll_aligned_(malloc|free) to take alignment size as a template argumentRichard Linden
2013-10-10MAINT-2968 Fix for crash on AMD hardware running current drivers.Dave Parks
2013-10-10Quite down log spam from loading shaders.Dave Parks
Up bone cap to 64 for rigged meshes.
2013-10-08merge from viewer-releaseRichard Linden
2013-10-07renamed TraceType to StatTypeRichard Linden
added more MemTrackable types optimized memory usage of LLTrace some more
2013-10-03added initial memory usage tracking for lltraceRichard Linden
2013-10-01Automated merge with http://bitbucket.org/lindenlab/viewer-releaseRichard Linden
2013-10-01changed over to manual naming of MemTrackable statsRichard Linden
changed claimMem and disclaimMem behavior to not pass through argument added more mem tracking stats to floater_stats
2013-09-26NORSPEC-259 revive fix stomped with materials->bear mergeGraham Linden