summaryrefslogtreecommitdiff
path: root/indra/llrender/llrender.cpp
AgeCommit message (Collapse)Author
2010-11-08MergeLoren Shih
2010-10-13correct licenses (fix problem with license change merge)Oz Linden
2010-09-10fix for VWR-22811: crash at LLImageGL::createGLTexture(int,unsigned char ↵Xiaohong Bao
const *,int,int) [secondlife-bin llimagegl.cpp] line 1259
2010-08-06fixed crash on entering build modeRichard Nelson
(transplanted from 72651623d96deee014411daeb82d50452261e0b3)
2010-08-27Backed out changeset 7a739cbdce56Tofu Linden
A proper fix from Richard is coming next.
2010-08-26lame-but-effective workaround for self-editing UI bug, until the right fix ↵Tofu Linden
is ready.
2010-08-24Backed out changeset c3d41f18ce2bTofu Linden
back-out the back-out for this branch. yay.
2010-08-24Backed out changeset a62bf7c0af21Tofu Linden
Backing out this merge that I pushed (prematurely) to the wrong place.
2010-08-24merge heads. whew.Tofu Linden
2010-08-13Change license from GPL to LGPL (version 2.1)Oz Linden
2010-08-26Fix for crash when rendering translation handles.Dave Parks
2010-07-23first pass ui rendering performance improvementsRichard Linden
2010-07-23first pass ui rendering performance improvementsRichard Linden
2010-03-12EXT-6276 Fix for UI going all wonky.Dave Parks
2010-03-12Bizarrely hacky fix for EXT-6276 (#if LL_DARWIN out copyFromPrimarySubstring)Dave Parks
General gl state cleanup in llui. Make llrender more gGL.begin/end friendly.
2010-03-11EXT-6276 Put in some gl flush calls to texture state functions.Dave Parks
2010-03-11EXT-6276 Put in some gl flush calls to register combiner functions (why ↵Dave Parks
these are being used for UI now is beyond me)
2010-02-13a better fix for the blend-factor init problem. I think.Tofu Linden
2010-03-07Add support for glBlendFuncSeparate().Tofu Linden
I want it to fix glow-through-alpha, but this checkin doesn't includes any of those changes.
2010-03-07Add support for glBlendFuncSeparate().Tofu Linden
I want it to fix glow-through-alpha, but this checkin doesn't includes any of those changes.
2010-02-08Fix for blend func being screwed up at init.Dave Parks
Fix for avatar appearance editor drawing hair in the background.
2010-02-06Fix for bad GL blend function caching.Dave Parks
2010-02-23mergePalmer Truelson
2010-02-23Turning back on Davep's ui optimizations. Backed out changeset 6c161782dba3Palmer Truelson
2010-02-12mergePalmer Truelson
2010-02-12Backed out davep's UI optimization. changeset 3134cb7bb181Palmer Truelson
2010-02-04mergeDave Parks
2010-02-04No more matrix ops in UI code.Dave Parks
2010-02-03CID-292Tofu Linden
Checker: UNINIT_CTOR Function: LLRender::LLRender() File: /indra/llrender/llrender.cpp
2010-01-11EXT-3784 Fix for first menu item going blank when highlighted on ATI cards.Runitai
2009-11-06merge QAR-1829: texture pipeline branch in viewer-2.0.0.3Xiaohong Bao
2009-09-22Merging render-pipeline-6-qa-2 into viewer-2David Parks
Self reviewed.
2009-07-10merge QAR-1579: texture-cleanup-1.Xiaohong Bao
2009-06-21merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3Steven Bennetts
ignore-dead-branch
2009-04-16svn merge -r117314:117337Adam Moss
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/mv13a-merge-1 QAR-1343 maint-viewer-13a+libcurlexploitfix-3-3 combo merge
2009-03-05Merging in Avatar Pipeline work for Viewer 1.23 (QAR-1272).Eric Tulla
No conflicts in the merge. Result of: svn merge -r113372:113479 $branches/avatar-pipeline/avatar-pipeline-merge-r113370 .
2009-02-18Merge of QAR-1267 to trunk. This was a combo merge of QAR-1175 ↵Brad Kittenbrink
(maint-render-9) and QAR-1236 (dll-msvcrt-2) svn merge -r 109838:112264 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-render/maint-render-9-merge-r109833
2009-01-13svn merge -r106055-107012 ↵Mark Palange
svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer_1-22/ merge RC5 changes into trunk, plus add'l localization xml (all newly added) files that should have been added with RC0-RC4 merge, but weren't.
2009-01-08Result of svn merge -r107256:107258 ↵Aaron Brashears
svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165
2008-12-23QAR-1142 merging 1.22 RC0-RC4 changes.Mark Palange
svn merge -c 106471 svn+ssh://svn.lindenlab.com/svn/linden/qa/viewer_1-22-106055_merge
2008-11-07QAR-992 Merging revisions 101012-101170,101686-101687 of ↵Mark Palange
svn+ssh://svn.lindenlab.com/svn/linden/qa/viewer_combo_1-22-merge into linden/release
2008-09-12QAR-855 Viewer 1.21 RC 2Steven Bennetts
merge viewer_1-21 94770-96059 -> release
2008-08-12QAR-767 Combined maint-render-7 and maint-viewer-9 mergeSteven Bennetts
merge release@93398 viewer-merge-1@94007 -> release dataserver-is-deprecated
2008-06-30Merging in file-move-merge ( QAR-649 )Eric Tulla
Result of "svn merge -r 90669:90786 $tulla/file-move-merge ." Be careful of future merges involving changes to any of these moved files as SVN usually does the wrong thing: newview/llglslshader.* -> llrender/llglslshader.*, llrender/llshadermgr.*, newview/llviewershadermgr.* (gets split into 3 separate files) newview/llpostprocess.* -> llrender/llpostprocess.* newview/llrendersphere.* -> llrender/llrendersphere.* newview/llcubemap.* -> llrender/llcubemap.* llwindow/llgl.* -> llrender/llgl.* llwindow/llglstates.h -> llrender/llglstates.h llwindow/llgltypes.h -> llrender/llgltypes.h llwindow/llglheaders.h -> llrender/llglheaders.h
2008-06-06QAR-650 - Viewer RC 9 merge -> release (post cmake)Steven Bennetts
merge release@88802 Branch_1-20-Viewer-2-merge-1@89178 -> release
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-24 22:50:36 +0000