| Age | Commit message (Collapse) | Author | |
|---|---|---|---|
| 2013-04-25 | Merge 3.5.1 into Materials | Graham Madarasz | |
| 2013-04-19 | merge changes for DRTVWR-294 | Oz Linden | |
| 2013-03-29 | Update Mac and Windows breakpad builds to latest | Graham Madarasz | |
| 2013-03-11 | merge | prep | |
| 2013-02-26 | BUILDFIX fixing undefined reference in build | Nyx Linden | |
| 2013-02-20 | clean up some debug logging, add comment on llassert | Oz Linden | |
| 2013-02-19 | Don't overrun the message buffer extracting materials ids when the region ↵ | Kitty Barnett | |
| isn't sending them | |||
| 2013-02-15 | additional safety check for bad appearance messages | Brad Payne (Vir Linden) | |
| 2013-02-13 | SH-3812 WIP, SH-3852 WIP - some metrics cleanup, added rebake when needed ↵ | Brad Payne (Vir Linden) | |
| and sb system is unavailable, to avoid stale appearance problems | |||
| 2013-02-12 | merge up to 3.4.5-release | Oz Linden | |
| 2013-01-25 | Trying to set materials up for rendering! Yay! | Geenz | |
| 2013-01-24 | merging in viewer-beta. | Nyx Linden | |
| Most of the merge was clean, a couple conflicts. Brought over a couple patches manually for llpolymesh. | |||
| 2012-10-09 | Initial pass at getting a list of viewer objects with non-null material IDs. | William Todd Stinson | |
| 2012-10-03 | Removing overly verbose debug outputs. | William Todd Stinson | |
| 2012-09-14 | Added some initial basic decoding of the material value per face. | William Todd Stinson | |
| 2012-09-05 | Merge in latest viewer-development | simon@Simon-PC.lindenlab.com | |
| 2012-07-30 | merge | Brad Payne (Vir Linden) | |
| 2012-07-13 | fix for SH-3235: Bump maps are not loaded until objects change LOD | Xiaohong Bao | |
| 2012-07-13 | SH-3267 WIP - extract cof version from avatar appearance message, use to ↵ | Brad Payne (Vir Linden) | |
| reject stale updates | |||
| 2012-07-12 | SH-3267 WIP | Brad Payne (Vir Linden) | |
| 2012-07-20 | MAINT-570 Remove unused memory tracking system LLMemType | Dave Parks | |
| 2012-06-28 | SH-3228 WIP - always respond to processAppearance for self, convert baked ↵ | Brad Payne (Vir Linden) | |
| textures to checkerboards | |||
| 2012-02-29 | SH-2689 FIX - a bit more logging and related cleanup. Somewhat arbitrarily ↵ | Brad Payne (Vir Linden) | |
| calling this done, although tweaks will be ongoing | |||
| 2011-04-04 | Automated merge up from viewer-development into mesh-development | Loren Shih | |
| 2011-04-01 | VWR-24487 make PREHASH variables char const* const | Boroondas Gupte | |
| 2010-10-13 | correct licenses (fix problem with license change merge) | Oz Linden | |
| 2010-08-13 | Change license from GPL to LGPL (version 2.1) | Oz Linden | |
| 2010-01-28 | Merge from viewer2 trunk. | Tofu Linden | |
| 2010-01-28 | CID-331 | Tofu Linden | |
| Checker: UNINIT_CTOR Function: LLPrimitive::LLPrimitive() File: /indra/llprimitive/llprimitive.cpp | |||
| 2009-11-07 | Fix for missing LOD spam. | Dave Parks | |
| 2009-11-05 | Fix for prims all being 0 lod. | Dave Parks | |
| Fix for dangling prim references. | |||
| 2009-11-05 | Fix for crash on teleport to mesh enabled region. | Dave Parks | |
| Fix for flashing meshes on LOD switch. | |||
| 2009-11-02 | Repairing things that didn't quite merge properly. | Palmer | |
| 2009-11-02 | Merge of viewer-2-0 changes | Palmer | |
| 2009-11-02 | Sync up with render-pipeline-7 ignore-dead-branch | David Parks | |
| 2009-10-02 | merge of latest viewer/viewer-20 | Mark Palange (Mani) | |
| 2009-10-01 | merge of latest lindenlab/svn-imports-viewer-20 | Mark Palange (Mani) | |
| 2009-10-01 | svn merge -r 134922:134973 ↵ | Monroe Williams | |
| svn+ssh://svn.lindenlab.com/svn/linden/branches/media-on-a-prim/moap-7 Merging branches/media-on-a-prim/moap-7 down to viewer-2.0. | |||
| 2009-09-30 | QAR-1619: merge up to 2009-09-26 viewer/viewer-20 | Nat Goodspeed | |
| 2009-09-26 | Merge into viewer/viewer-20 yesterday's lindenlab/svn-imports-viewer-20 | Nat Goodspeed | |
| 2009-09-22 | Merging render-pipeline-6-qa-2 into viewer-2 | David Parks | |
| Self reviewed. | |||
| 2009-09-18 | Merged latest viewer/viewer-20 into login-api. | brad kittenbrink | |
| 2009-09-01 | Fix up some more post-merge breakage. | brad kittenbrink | |
| 2009-08-31 | Merge with trunk | Bryan O'Sullivan | |
| 2009-07-29 | svn merge -r128774:128808 svn+ssh://svn.lindenlab.com/svn/user/cg/qar-1737 | Christian Goetze | |
| effective merge: svn merge -r127126:128746 svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.27 | |||
| 2009-07-07 | svn merge -r 126003:126087 ↵ | Don Kjer | |
| svn+ssh://svn/svn/linden/qa/light-texture-params/light-texture-params-2 into trunk | |||
| 2009-06-22 | Merge with viewer-2.0.0-3 branch | Bryan O'Sullivan | |
| 2009-06-21 | merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3 | Steven Bennetts | |
| ignore-dead-branch | |||
| 2009-05-22 | DEV-27646 dll linkage for login module. | Brad Kittenbrink | |
| Ok, finally got this to a point where it doesn't break the build and I can check in. llcommon can be built as a shared library (disabled but can be enabled with cmake cache var LLCOMMON_LINK_SHARED. reviewed by Mani on tuesday (I still need to get his suggested changes re-reviewed) | |||
| 2009-04-01 | QAR-1284 ip-takedown tools simulator work is ready for merge | Andrew Meadows | |
| svn merge -r115879:116020 svn+ssh://svn.lindenlab.com/svn/linden/branches/dmcat/dmcat-5 no conflicts | |||
 |
index : viewer.git | |
| Megapahit's fork of the Second Life viewer. | Erik Kundiman |
| summaryrefslogtreecommitdiff |