summaryrefslogtreecommitdiff
path: root/indra/newview/llhudtext.cpp
AgeCommit message (Expand)Author
2010-10-20Fix for automated merge comiple errors.Loren Shih
2010-10-20Automated merge up from viewer-developmentLoren Shih
2010-10-13correct licenses (fix problem with license change merge)Oz Linden
2010-09-03Post-convert merge by convert_monolith.py from /Users/Aimee/Documents/Work/Li...Aimee Linden
2010-08-13Change license from GPL to LGPL (version 2.1)Oz Linden
2010-05-29Octree per LLVolumeFace WIPDave Parks
2010-05-25Better vectorization of various things. Turn off debug gl by default.Dave Parks
2010-05-22Vectorize/memory align buffers in llvolumeface WIPDave Parks
2010-03-10Name tag color and position hackery for demoJames Cook
2010-03-09More name-tag vs. hud-text cleanupJames Cook
2010-03-09More harmonization of LLHUDNameTag vs. LLHUDTextJames Cook
2010-03-09Break name tag code out into LLHUDNameTagJames Cook
2010-03-08Merge with viewer 2 beta 4James Cook
2010-02-25Support multiple fonts, colors and styles in name tagsJames Cook
2010-02-18Backed out changeset 83d7019fda75Tofu Linden
2010-02-18EXT-5389 Unreadable resident names with glow.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 the...Tofu Linden
2010-02-12Backed out davep's UI optimization. changeset 3134cb7bb181Palmer Truelson
2010-02-10Name tags of friends appear in green.James Cook
2010-02-09mergedavep@billy.gateway.2wire.net
2010-02-23Turning back on Davep's ui optimizations. Backed out changeset 6c161782dba3Palmer Truelson
2010-02-04No more matrix ops in UI code.Dave Parks
2010-01-13Merge.Tofu Linden
2010-01-08First pass expose inventory item settings in XML (folder_view_item.xml)James Cook
2010-01-07Merge latest fixes from viewer2.Tofu Linden
2010-01-06moved clipping logic inside LLFontGL::maxDrawableChars controlled by EWordWra...richard
2010-01-06EXT-3878 - Menus disappear when UI Size is < 1.00richard
2009-11-17Automated merge with ssh://palmer@hg.lindenlab.com/viewer/viewer-2-0Palmer
2009-11-10Sanitize naming of getWindowRect (scaled vs. raw pixels) and getWorldViewRect...James Cook
2009-11-02Sync up with render-pipeline-7 ignore-dead-branchDavid Parks
2009-09-22Merging render-pipeline-6-qa-2 into viewer-2David Parks
2009-08-24merge -r 130399-131510 skinning-21 -> viewer-2.0.0-3Richard Nelson
2009-07-21merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0/...Steven Bennetts
2009-07-10merge QAR-1579: texture-cleanup-1.Xiaohong Bao
2009-07-06Merge xui-army-5 to viewer-2, includes layout, art, and color changes, also U...James Cook
2009-06-21merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3Steven Bennetts
2009-03-13svn merge -r114093:114412 svn+ssh://svn.lindenlab.com/svn/linden/branches/fea...Christian Goetze
2009-03-05Merging in Avatar Pipeline work for Viewer 1.23 (QAR-1272).Eric Tulla
2009-02-18Merge of QAR-1267 to trunk. This was a combo merge of QAR-1175 (maint-render...Brad Kittenbrink
2009-01-08Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_20...Aaron Brashears
2008-11-07QAR-992 Merging revisions 101012-101170,101686-101687 of svn+ssh://svn.linden...Mark Palange
2008-08-12QAR-767 Combined maint-render-7 and maint-viewer-9 mergeSteven Bennetts
2008-06-26QAR-628 merge string-cleanup-5 -r 90476:90508 -> releaseSteven Bennetts
2008-06-06QAR-650 - Viewer RC 9 merge -> release (post cmake)Steven Bennetts
2008-05-08QAR-570 maint-render-4 mergeSteven Bennetts
2008-04-01merge release@83343 skinning-1-merge@83714 -> releaseSteven Bennetts
2008-03-25merge release@82858 maint-render-2-merge@83010 -> releaseSteven Bennetts
2008-02-27Merge of windlight into release (QAR-286). This includes all changes inBrad Kittenbrink
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-03 06:01:04 +0000