summaryrefslogtreecommitdiff
path: root/indra/llrender
AgeCommit message (Collapse)Author
2010-04-12slightly-hairy merge from viewer-trunkTofu Linden
2010-04-12(slightly hairy) merge from viewer-hotfixTofu Linden
2010-04-09debug code for EXT-6791: Intel 965 Crash in glCopyTexSubImage2D.Xiaohong Bao
2010-04-06Rigged attachments (almost works).Dave Parks
2010-04-01mergeDave Parks
2010-03-30HUGE merge from viewer-trunk. Many conflicts resolved.Tofu Linden
2010-03-26If the EXT-5854 fix is correct, this assert no longer makes sense.Tofu Linden
2010-03-25mergeDave Parks
2010-03-25rigged attachments WIPDave Parks
2010-03-25Automated merge with ssh://hg.lindenlab.com/q/viewer-trunkXiaohong Bao
2010-03-25fix for EXT-5854:Unable to Pay Object That Features Transparant (alpha) Texture.Xiaohong Bao
2010-03-24viewer2 mergeTofu Linden
2010-03-23EXT-5549 Can't select last character in chat windowRichard Nelson
2010-03-20mergeDave Parks
2010-03-18merge from hotfix to viewer-2-0 and resolve conflictsKent Quirk
2010-03-13merge with viewer-2-0Dave Parks
2010-03-12Fix for EXT-6336 Minor memory leak in LLFontRegistry::createFontAimee Linden
Reviewed by: Tofu
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-03-08Remove a '#error XXX' I was using to test ifdef-hell.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-05Remove some fast timers that were being futzy.Dave Parks
2010-03-04Optimiziation pass.Dave Parks
Added RenderUseStreamVBO to enable/disable usage of VBO's for streaming buffers. Faster traversal of LLCullResult members. Removal of llpushcallstacks from inner loops. Sprinkling in fast timers.
2010-02-28Remove some dead code.Dave Parks
Add LH transform to LLVector3 Add DebugShowUploadCost Make LOD generation on model preview less finnicky. Remove error level based LOD generation. Better framing of model before upload. Better error handling for model uploader. Remove [COST] argument from model upload menu item. Remove L$ check from model upload menu item being enabled.
2010-02-23D'oh. Merge bork.Palmer Truelson
2010-02-23Merge with viewer 2.Palmer Truelson
2010-02-19fix warning introduced from trunk merge.Tofu Linden
2010-02-19merge from viewer2, conflicts resolved...Tofu Linden
2010-02-19EXT-5553 improve alpha mask ('fast alpha') heuristicTofu Linden
rev'd by davep
2010-02-18Additional optimizations to text reflow for EXT-5071.Monroe Linden
Added versions of LLFontFreeType::getXAdvance() and LLFontFreeType::getXKerning() that take LLFontGlyphInfo* instead of llwchar. This allows code in LLFontGL that already has the LLFontGlyphInfo* to pass them instead, saving calls to LLFontFreetype::getGlyphInfo. Reviewed by Richard.
2010-02-13gah, more blending fixing.Tofu Linden
2010-02-13a better fix for the blend-factor init problem. I think.Tofu Linden
2010-02-13a better fix for the blend-factor init problem. I think.Tofu Linden
2010-02-13sigh, fix another backout-backout problem.Tofu Linden
2010-02-13restore blend factor init fix.Tofu Linden
2010-02-13merge backout.Tofu Linden
2010-02-13Backed out changeset 6c161782dba3Tofu Linden
2010-02-13merge from viewer2. this fucks up davep's optimizations, so I'll backout ↵Tofu Linden
their backout next to restore them. I hope. Sheesh.
2010-02-12mergePalmer Truelson
2010-02-12Backed out davep's UI optimization. changeset 3134cb7bb181Palmer Truelson
2010-02-12mergePalmer
2010-02-09mergedavep@billy.gateway.2wire.net
2010-02-09mergedavep@billy.gateway.2wire.net
2010-02-09merge from viewer2 trunk.Tofu Linden
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-08Fix for blend func being screwed up at init.Dave Parks
Fix for avatar appearance editor drawing hair in the background.
2010-02-08Enable FBO multisampling for OSX.Dave Parks
Fix bad triangle in prim caps.
2010-02-08Fixed critical bug EXT-4971 (Crash when attemping to change UI size)Andrew Dyukov
- Adding default glyph for fallback fonts is now skipped in LLFontFreetype::resetBitmapCache(). --HG-- branch : product-engine