livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
28,102 Commits
2 Branches
0 Tags
297 MiB
Commit Graph

72 Commits (f356d7eb9fd730f5f6f5a29fb0706e20876ad3bd)

Author SHA1 Message Date
Graham Madarasz f356d7eb9f Fix many issues with selection misapplication and rendering not matching applied materials 2013-05-11 19:58:56 -07:00
Graham Madarasz e413f4b335 Fixup merge diffs 2013-05-10 15:13:07 -07:00
Graham Madarasz 025c890958 Merge vwr-dev-mat 2013-05-01 08:11:15 -07:00
Graham Madarasz 806d09b114 Merge 3.5.1 into Materials 2013-04-30 19:50:05 -07:00
Graham Madarasz fd447189c5 Merge 3.5.1 into Materials 2013-04-25 21:00:16 -07:00
Oz Linden ddd5659f81 merge changes for DRTVWR-294 2013-04-19 10:11:29 -04:00
Graham Madarasz bf6182daa8 Update Mac and Windows breakpad builds to latest 2013-03-29 07:50:08 -07:00
prep 8e3b190e91 merge 2013-03-11 15:17:13 -04:00
Nyx Linden 998c31ef9e BUILDFIX fixing undefined reference in build 2013-02-26 15:29:23 -05:00
Oz Linden 5711bda96a clean up some debug logging, add comment on llassert 2013-02-20 12:03:29 -05:00
Kitty Barnett a6e8e60f50 Don't overrun the message buffer extracting materials ids when the region isn't sending them 2013-02-19 21:21:41 +01:00
Brad Payne (Vir Linden) 354ccc1640 additional safety check for bad appearance messages 2013-02-15 13:44:21 -05:00
Brad Payne (Vir Linden) 72dfb2abce SH-3812 WIP, SH-3852 WIP - some metrics cleanup, added rebake when needed and sb system is unavailable, to avoid stale appearance problems 2013-02-13 17:28:05 -05:00
Oz Linden 8bb3d0891d merge up to 3.4.5-release 2013-02-12 13:27:03 -05:00
Geenz 5f03e197f4 Trying to set materials up for rendering! Yay! 2013-01-25 17:54:38 -05:00
Nyx Linden 11fe124ae9 merging in viewer-beta. 
Most of the merge was clean, a couple conflicts.
Brought over a couple patches manually for llpolymesh.
 2013-01-24 16:22:49 -05:00
William Todd Stinson 38a565f71a Initial pass at getting a list of viewer objects with non-null material IDs. 2012-10-09 12:30:38 -07:00
William Todd Stinson dbe0a577ae Removing overly verbose debug outputs. 2012-10-03 18:31:33 -07:00
William Todd Stinson ae10e78d97 Added some initial basic decoding of the material value per face. 2012-09-14 17:56:42 -07:00
simon@Simon-PC.lindenlab.com 38acb45af8 Merge in latest viewer-development 2012-09-05 17:17:54 -07:00
Brad Payne (Vir Linden) 6ae4802e6d merge 2012-07-30 19:10:46 -04:00
Xiaohong Bao 833d73d674 fix for SH-3235: Bump maps are not loaded until objects change LOD 2012-07-13 17:46:43 -06:00
Brad Payne (Vir Linden) 409be9dcc4 SH-3267 WIP - extract cof version from avatar appearance message, use to reject stale updates 2012-07-13 16:59:57 -04:00
Brad Payne (Vir Linden) 27c7b259b4 SH-3267 WIP 2012-07-12 18:24:23 -04:00
Dave Parks 4a5ad35793 MAINT-570 Remove unused memory tracking system LLMemType 2012-07-20 11:42:15 -05:00
Brad Payne (Vir Linden) e4a0dda457 SH-3228 WIP - always respond to processAppearance for self, convert baked textures to checkerboards 2012-06-28 14:24:04 -04:00
Brad Payne (Vir Linden) 07545e99fc SH-2689 FIX - a bit more logging and related cleanup. Somewhat arbitrarily calling this done, although tweaks will be ongoing 2012-02-29 13:09:28 -05:00
Loren Shih 47781184fc Automated merge up from viewer-development into mesh-development 2011-04-04 10:42:52 -04:00
Boroondas Gupte 2c584790d0 VWR-24487 make PREHASH variables char const* const 2011-04-01 09:14:52 -04:00
Oz Linden a5619d16f7 correct licenses (fix problem with license change merge) 2010-10-13 07:24:37 -04:00
Oz Linden 06b0d72efa Change license from GPL to LGPL (version 2.1) 2010-08-13 07:24:57 -04:00
Tofu Linden 5a34cf1af8 Merge from viewer2 trunk. 2010-01-28 12:48:48 -08:00
Tofu Linden 0d5a6ea3c0 CID-331 
Checker: UNINIT_CTOR
Function: LLPrimitive::LLPrimitive()
File: /indra/llprimitive/llprimitive.cpp
 2010-01-28 10:25:09 -08:00
Dave Parks 4e420a36c6 Fix for missing LOD spam. 2009-11-07 08:22:39 -06:00
Dave Parks 10069e0e13 Fix for prims all being 0 lod. 
Fix for dangling prim references.
 2009-11-05 19:58:10 -06:00
Dave Parks 1c495c56c1 Fix for crash on teleport to mesh enabled region. 
Fix for flashing meshes on LOD switch.
 2009-11-05 17:12:18 -06:00
Palmer 63b9bd43ff Repairing things that didn't quite merge properly. 2009-11-02 14:56:46 -08:00
Palmer b81feb6ae7 Merge of viewer-2-0 changes 2009-11-02 14:16:08 -08:00
David Parks 3e80fa3dbc Sync up with render-pipeline-7 ignore-dead-branch 2009-11-02 19:55:37 +00:00
Mark Palange (Mani) 4d53e235c2 merge of latest viewer/viewer-20 2009-10-02 10:35:42 -07:00
Mark Palange (Mani) dde2153014 merge of latest lindenlab/svn-imports-viewer-20 2009-10-01 18:19:45 -07:00
Monroe Williams cf9239cabc svn merge -r 134922:134973 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-10-01 02:35:53 +00:00
Nat Goodspeed eca30a2262 QAR-1619: merge up to 2009-09-26 viewer/viewer-20 2009-09-30 21:42:04 -04:00
Nat Goodspeed bc4444cd78 Merge into viewer/viewer-20 yesterday's lindenlab/svn-imports-viewer-20 2009-09-26 18:08:24 -04:00
David Parks 536e38ad51 Merging render-pipeline-6-qa-2 into viewer-2 
Self reviewed.
 2009-09-22 11:11:45 +00:00
brad kittenbrink bb1d4592bd Merged latest viewer/viewer-20 into login-api. 2009-09-18 15:22:25 -04:00
brad kittenbrink 0f0853a6fe Fix up some more post-merge breakage. 2009-09-01 18:16:04 -04:00
Bryan O'Sullivan 30ff6cabd6 Merge with trunk 2009-08-31 13:47:47 -07:00
Christian Goetze 87776b1944 svn merge -r128774:128808 svn+ssh://svn.lindenlab.com/svn/user/cg/qar-1737 
effective merge: svn merge -r127126:128746 svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.27
 2009-07-29 22:16:52 +00:00
Don Kjer a05617a654 svn merge -r 126003:126087 svn+ssh://svn/svn/linden/qa/light-texture-params/light-texture-params-2 into trunk 2009-07-07 18:30:20 +00:00