Commit Graph

264 Commits (a2c7b0485576c6bb92f6d0eddc762f5e37d5caac)

Author SHA1 Message Date
Xiaohong Bao a2c7b04855 more fix for SH-4397: Object cache occlusion culling results are not always correct 2013-08-07 22:53:27 -06:00
Xiaohong Bao 576b933997 fix for SH-4397: Object cache occlusion culling results are not always correct 2013-08-05 14:48:26 -06:00
Xiaohong Bao 52f292c063 Merge 2013-07-23 23:07:16 -06:00
Richard Linden a2a6bf20d7 merge with release 2013-06-20 16:46:23 -07:00
Xiaohong Bao b38170e681 fix for SH-4245: Interesting: crash in LLSpatialGroup::handleDestruction 2013-06-19 11:45:44 -06:00
Dave Parks ccd04cd66c Occlusion culling overhaul. 2013-06-18 17:24:21 -05:00
Graham Madarasz 88553c9eb1 Cleanup rollback and try point MIPs experiment to see if that's what is hosing the Mac on 10.6.8 2013-06-12 12:19:48 -07:00
Graham Madarasz d2b253f1f6 Changes to protect against use of normalize3fast on degenerate vectors 2013-06-12 09:16:19 -07:00
Richard Linden 0a96b47663 merge with viewer-release 2013-06-05 19:05:43 -07:00
Dave Parks c3f14b915c NORSPEC-229 Fix for bad binormals on mirrored surfaces (use tangent calculator instead of binormal calculator, convert binormal centric code to tangent centric) 2013-06-03 12:50:48 -05:00
Xiaohong Bao 16616ae48d for SH-4145: Interesting: Implement occlusion culling for object cache 2013-05-23 18:25:21 -06:00
Graham Madarasz 1f5f0a4b06 Merge vwr-dev-mat 2013-05-07 12:42:32 -07:00
Dave Parks 18e3985120 NORSPEC-162 Fix for objects with materials set ignoring "tranparency %" value. 2013-05-06 15:44:44 -05: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
Dave Parks 8025b8b2bc NORSPEC-49 Add shader profiler, add support for ARB_depth_clamp where available 2013-04-15 13:16:14 -05:00
Dave Parks 78d23e6642 NORSPEC-75 Add appropriate draw calls to underwater render passes so objects with material data don't disappear in water. 2013-04-10 00:27:32 -05:00
Oz Linden 2fde4a9ae5 merge changes for 3.5.0-beta7 2013-04-01 14:24:01 -04:00
Dave Parks d81fde49f7 NORSPEC-64 Fix for batches breaking on every single face when materials are in play. 2013-03-29 12:02:53 -05:00
Graham Madarasz bf6182daa8 Update Mac and Windows breakpad builds to latest 2013-03-29 07:50:08 -07:00
Richard Linden 68f9f656cd merge with viewer-release 2013-03-22 00:44:59 -07:00
prep 207d9fd767 Viewer-chui merge 2013-03-11 14:45:53 -04:00
Oz Linden 8bb3d0891d merge up to 3.4.5-release 2013-02-12 13:27:03 -05:00
Merov Linden faae38daaa Pull merge from lindenlab/viewer-developement 2013-01-30 20:01:03 -08:00
Geenz aa1befd689 Specular map support. This is the vast majority of the material parameters implemented at this point for opaque geometry. 2013-01-30 12:17:04 -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
Xiaohong Bao 7cc37d949e fix the merge errors from the changeset 3eadda9666cf 2013-01-09 22:43:10 -07:00
Xiaohong Bao 8315e97453 Merge 2013-01-08 14:50:31 -07:00
Xiaohong Bao 21409a3aaa for SH-3350 and SH-3353: Report frame-to-frame visual deltas as an LLStat 2012-11-30 22:50:06 -07:00
prep e0432f98ee SH-3563. Pull and merge from viewer-development. Modest code changes to fix alignment issue in llAppearance. 2012-11-28 16:36:34 -05:00
Richard Linden c0224cc47a merge with viewer-development 2012-11-19 19:06:36 -08:00
Xiaohong Bao 5ae116f89b for SH-3471: create a simplified version of octree for object cache entries. 2012-10-31 17:05:53 -06:00
William Todd Stinson be0406bffd Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta. 2012-10-31 10:52:54 -07:00
Oz Linden 1a872c7bf8 pull back changes from 3.4.1-beta11 2012-10-30 14:34:05 -04:00
Richard Linden a52d203a4f SH-3405 WIP convert existing stats to lltrace system
started conversion of llviewerassetstats
removed old, dead LLViewerStats code
made units tracing require units declaration
clean up of units handling
2012-10-17 20:00:07 -07:00
William Todd Stinson 9da9b2d84b Pull and merge from ssh://stinson@hg.lindenlab.com/richard/viewer-chui/. 2012-10-17 14:32:29 -07:00
Xiaohong Bao c0ba626c80 For SH-3333: Design and implement a new object cache system on viewer side 2012-10-15 21:34:29 -06:00
simon@Simon-PC.lindenlab.com d6e3b0445a Merge in viewer-development code and fix build 2012-10-15 14:23:29 -07:00
Dave Parks cdbfdfc351 MAINT-1709 Factor out realloc
Reviewed by VoidPointer
2012-10-11 17:02:45 -05:00
Dave Parks 7ebbb5067d MAINT-1709 Factor out realloc
Reviewed by VoidPointer
2012-10-11 17:02:45 -05:00
Oz Linden 1709952adb pull back 3.4.1-beta6 fixes 2012-10-10 21:40:10 -04:00
Don Kjer c06c35609c Updating linux build to gcc4.6 2012-10-11 00:09:04 +00:00
William Todd Stinson 4a3bdb6896 Pull and merge from ssh://hg@bitbucket.org/oz_linden/viewer-beta-drtvwr-179. 2012-10-10 15:10:48 -07:00
Dave Parks bc0abc7734 Fix up some assertions in lloctree.h 2012-10-02 12:11:42 -05:00
Dave Parks b5e71964e5 reapply c77cea5c6e41: MAINT-646 Cleanup some warnings from previous changes. 2012-09-20 10:00:56 -04:00
Dave Parks 683c43c2e0 reapply 448b02f5b56f: MAINT-1147 Fix for frame stall on region crossing. 2012-09-20 10:00:55 -04:00
Dave Parks 6a09bc187c reapply 0f20bb7cb9ee: MAINT-1147 Don't rebuild volume meshes on region crossing. 2012-09-20 09:48:56 -04:00
Dave Parks cf98064700 reapply 52b6c9168974: MAINT-646 Factor std::set out of lloctree 2012-09-20 09:48:55 -04:00
Dave Parks 5c3c556e94 reapply 4f8ca653a394: Fix for linux build. 2012-09-20 09:48:52 -04:00