| Age | Commit message (Collapse) | Author | |
|---|---|---|---|
| 2010-10-20 | Fix for automated merge comiple errors. | Loren Shih | |
| 2010-10-20 | Automated merge up from viewer-development | Loren Shih | |
| 2010-10-13 | correct licenses (fix problem with license change merge) | Oz Linden | |
| 2010-09-03 | Post-convert merge by convert_monolith.py from ↵ | Aimee Linden | |
| /Users/Aimee/Documents/Work/Linden-Lab/Development/viewer/convert/viewer-identity-evolution | |||
| 2010-08-13 | Change license from GPL to LGPL (version 2.1) | Oz Linden | |
| 2010-05-29 | Octree per LLVolumeFace WIP | Dave Parks | |
| 2010-05-25 | Better vectorization of various things. Turn off debug gl by default. | Dave Parks | |
| 2010-05-22 | Vectorize/memory align buffers in llvolumeface WIP | Dave Parks | |
| 2010-03-10 | Name tag color and position hackery for demo | James Cook | |
| 2010-03-09 | More name-tag vs. hud-text cleanup | James Cook | |
| 2010-03-09 | More harmonization of LLHUDNameTag vs. LLHUDText | James Cook | |
| Eliminating now-unused code from LLHUDText | |||
| 2010-03-09 | Break name tag code out into LLHUDNameTag | James Cook | |
| Start by duplicating the LLHUDText code, then stripping out functionality that only needs to exist in one place (like force-based juggling of name tag positions) | |||
| 2010-03-08 | Merge with viewer 2 beta 4 | James Cook | |
| 2010-02-25 | Support multiple fonts, colors and styles in name tags | James Cook | |
| Simplified LLHUDText string API to be UTF8 only Added per-text segment font support Changed LLVOAvatar invalidateNameTag to clearNameTag | |||
| 2010-02-18 | Backed out changeset 83d7019fda75 | Tofu Linden | |
| backing-out render-pipeline-specific version of EXT-5389 fix because it just doesn't reliably work right. | |||
| 2010-02-18 | EXT-5389 Unreadable resident names with glow. | Tofu Linden | |
| An alternative fix just for render-pipeline. This is here instead of the trunk because it's cosmetically less good, and codewise a little weirder, and slightly (unmeasurably?) less performant. But its advantage over the trunk fix is, it's still Z-buffered when FBOs are turned on. Which we really care about on render-pipeline. | |||
| 2010-02-13 | merge backout. | Tofu Linden | |
| 2010-02-13 | Backed out changeset 6c161782dba3 | Tofu Linden | |
| 2010-02-13 | merge 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-12 | Backed out davep's UI optimization. changeset 3134cb7bb181 | Palmer Truelson | |
| 2010-02-10 | Name tags of friends appear in green. | James Cook | |
| Refactored LLVOAvatar idleUpdateNameTag into smaller functions Eliminated unused LLHUDText::setUsePixelSize | |||
| 2010-02-09 | merge | davep@billy.gateway.2wire.net | |
| 2010-02-23 | Turning back on Davep's ui optimizations. Backed out changeset 6c161782dba3 | Palmer Truelson | |
| 2010-02-04 | No more matrix ops in UI code. | Dave Parks | |
| 2010-01-13 | Merge. | Tofu Linden | |
| 2010-01-08 | First pass expose inventory item settings in XML (folder_view_item.xml) | James Cook | |
| Optimized LLFolderViewItem constructor by passing param block as const ref to avoid copies. Removed per-item arrow and background images, use defaults. Removed unneeded static image pointers. Removed hard-coded rounded_square.tga, replaced with Rounded_Square Ditto for folder_arrow.tga Reviewed with Richard. | |||
| 2010-01-07 | Merge latest fixes from viewer2. | Tofu Linden | |
| 2010-01-06 | moved clipping logic inside LLFontGL::maxDrawableChars controlled by ↵ | richard | |
| EWordWrapStyle fixes regression introduced in 3eef5ce9ae1e6fc62b9b52ce859501dd4e70fadf reviewed by Brad | |||
| 2010-01-06 | EXT-3878 - Menus disappear when UI Size is < 1.00 | richard | |
| EXT-3647 - Auto-scrolling of IMs should resume when user types in chat EXT-3877 - Pinning two levels of menus prevents movement using arrow keys EXT-1303 - Hyperlink text wraps in the middle of a word reviewed by James | |||
| 2009-11-17 | Automated merge with ssh://palmer@hg.lindenlab.com/viewer/viewer-2-0 | Palmer | |
| 2009-11-10 | Sanitize naming of getWindowRect (scaled vs. raw pixels) and ↵ | James Cook | |
| getWorldViewRect (scaled vs. raw) Reduces chance of future UI bugs related to UI size. Discussed with Richard. | |||
| 2009-11-02 | Sync up with render-pipeline-7 ignore-dead-branch | David Parks | |
| 2009-09-22 | Merging render-pipeline-6-qa-2 into viewer-2 | David Parks | |
| Self reviewed. | |||
| 2009-08-24 | merge -r 130399-131510 skinning-21 -> viewer-2.0.0-3 | Richard Nelson | |
| DEV-11254 DEV-11254 DEV-2003: DEV-21567 DEV-37301 EXT-104 EXT-138 EXT-217 EXT-256 EXT-259 EXT-259 EXT-328 EXT-348 EXT-386 EXT-399 EXT-403 EXT-460 EXT-492 EXT-492 EXT-531 EXT-537 EXT-684 improved text editor (handles multiple fonts simultaneously as well as inline widgets) | |||
| 2009-07-21 | merge ↵ | Steven Bennetts | |
| https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0/indra@1059 https://svn.aws.productengine.com/secondlife/pe/stable-1/indra@1070 -> svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3 | |||
| 2009-07-10 | merge QAR-1579: texture-cleanup-1. | Xiaohong Bao | |
| 2009-07-06 | Merge xui-army-5 to viewer-2, includes layout, art, and color changes, also ↵ | James Cook | |
| UI color refactoring and new FreeType font library on Linux. svn merge -r126038:126164 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/xui-army-5 | |||
| 2009-06-21 | merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3 | Steven Bennetts | |
| ignore-dead-branch | |||
| 2009-03-13 | svn merge -r114093:114412 ↵ | Christian Goetze | |
| svn+ssh://svn.lindenlab.com/svn/linden/branches/featurettes/featurettes-batch5-merge Melinda (coco): 5th and final batch of featurettes. My work here is done. | |||
| 2009-03-05 | Merging 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-18 | Merge 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-08 | Result of svn merge -r107256:107258 ↵ | Aaron Brashears | |
| svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 | |||
| 2008-11-07 | QAR-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-08-12 | QAR-767 Combined maint-render-7 and maint-viewer-9 merge | Steven Bennetts | |
| merge release@93398 viewer-merge-1@94007 -> release dataserver-is-deprecated | |||
| 2008-06-26 | QAR-628 merge string-cleanup-5 -r 90476:90508 -> release | Steven Bennetts | |
| dataserver-is-deprecated | |||
| 2008-06-06 | QAR-650 - Viewer RC 9 merge -> release (post cmake) | Steven Bennetts | |
| merge release@88802 Branch_1-20-Viewer-2-merge-1@89178 -> release | |||
| 2008-05-08 | QAR-570 maint-render-4 merge | Steven Bennetts | |
| merge -r 87067:87077 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-render/maint-render-4-merge -> release. dataserver-is-deprecated. | |||
| 2008-04-01 | merge release@83343 skinning-1-merge@83714 -> release | Steven Bennetts | |
| QAR-424 | |||
| 2008-03-25 | merge release@82858 maint-render-2-merge@83010 -> release | Steven Bennetts | |
| QAR-389 | |||
| 2008-02-27 | Merge of windlight into release (QAR-286). This includes all changes in | Brad Kittenbrink | |
| windlight14 which have passed QA (up through r79932). svn merge -r 80831:80833 svn+ssh://svn.lindenlab.com/svn/linden/branches/merge_windlight14_r80620 | |||
 |
index : viewer.git | |
| Megapahit's fork of the Second Life viewer. | Erik Kundiman |
| summaryrefslogtreecommitdiff |