Commit Graph

434 Commits (22a851663cddecced21acd88ed8ae4fa9fc733fd)

Author SHA1 Message Date
simon@Simon-PC.lindenlab.com 173d0fa213 Pull in viewer-development because it's painful. Merge with runitai's help. 2012-07-11 16:15:23 -07:00
Oz Linden 9b1208e495 disable alignment tests in debug builds (where they fail) 2012-07-02 10:18:38 -04:00
Oz Linden 2c3e78f1f1 merge changes for DRTVWR-167 2012-06-27 14:18:22 -04:00
Brad Payne (Vir Linden) 89ee86c86c line endings fix 2012-06-22 15:54:53 -04:00
Dave Parks 9e9d32de38 merge 2012-06-22 14:04:33 -05:00
Dave Parks 99dc246ac8 Merge 2012-06-15 14:29:46 -05:00
Dave Parks 6dd3840b44 MAINT-646 Factor std::vector out of lloctree 2012-06-05 13:32:18 -05:00
Dave Parks 92ee373e45 MAINT-646 Factor std::set out of lloctree 2012-06-05 12:55:17 -05:00
Brad Payne (Vir Linden) 542975b4c6 merge 2012-06-04 16:19:18 -04:00
Oz Linden c97ddff395 merge changes for storm-1863 2012-05-30 14:24:47 -04:00
Dave Parks b7cfd8c7f0 MAINT-616 Factor out calls to glGenFoo where possible, add setting to control synchronizing strategy WRT occlusion queries, add experimental transform feedback driven LoD update 2012-05-21 23:33:25 -05:00
Seth ProductEngine bc4d0b0b0f Linux build fix.
Moved type casts from protected base classes to derived LLCoord.
(transplanted from fa4c01adac7224b909ab1dbfc90416b633e6d6c2)
2012-02-23 21:02:46 +02:00
Seth ProductEngine a5e4b15b7d Linux build fix.
Moved type casts from protected base classes to derived LLCoord.
2012-02-23 21:02:46 +02:00
Merov Linden 5c8bcc4643 Fix Linux compile issue : make templated type casting explicit (2) 2012-02-13 16:39:35 -08:00
Merov Linden e8b8be637b Fix Linux compile issue : make templated type casting explicit 2012-02-13 15:53:41 -08:00
Richard Linden bbdb390624 Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience/ 2012-02-08 19:55:28 -08:00
Brad Payne (Vir Linden) 635a264e6f merge 2012-02-08 11:22:52 -05:00
Richard Linden f27ea1aff7 EXP-1181 WIP as a designer I would like to specify default floater positions using realtive coordinates
fixed build
moved conversion funcs to llwindow.cpp as they work on all platforms
refactored translateintorect to take overlap as parameter
2012-02-07 22:50:49 -08:00
Richard Linden 4e08461f8a EXP-1181 WIP as a designer I would like to specify default floater positions using realtive coordinates
changed over to new convert() method
added LLCoordFloater
2012-02-07 19:29:10 -08:00
Richard Linden d56be1f175 EXP-1181 WIP as a designer I would like to specify default floater positions using realtive coordinates
refactored LLCoord code to be templated, ultimately to support arbitrary conversions
2012-02-07 12:31:48 -08:00
Richard Linden 2ed1de224a Automated merge with http://hg.secondlife.com/viewer-development 2012-02-06 15:28:45 -08:00
Brad Payne (Vir Linden) b9376ab990 merge 2012-02-02 10:57:09 -05:00
Richard Linden d32c1c28b4 cleaned up linden_common.h, removing stuff that is mostly unused 2012-02-01 16:39:27 -08:00
Richard Linden 5a14a67e06 converted a bunch of narrowing implicit conversions to explicit 2012-02-01 13:03:46 -08:00
Brad Payne (Vir Linden) 0b16411d30 assert fix for mempyNonAliased16 call 2012-01-26 14:07:37 -05:00
Dave Parks 18e7f1bffd SH-2889 Add visual auto-muting controls 2012-01-20 16:42:57 -06:00
Brad Payne (Vir Linden) 80c884f77d Fix for build failure 2012-01-04 17:30:11 -05:00
Brad Payne (Vir Linden) 1435a8b9e6 SH-2789 WIP - stricter calling of memcpyNonAliased16 2012-01-04 15:21:23 -05:00
Brad Payne (Vir Linden) c8682722ad SH-2789 WIP - aligned alloc and realloc 2011-12-21 17:02:47 -05:00
Brad Payne (Vir Linden) 461241a630 SH-2789 WIP - fixes for 16-byte alignment 2011-12-20 12:15:29 -05:00
Brad Payne (Vir Linden) 9c2e0d84f8 SH-2789 WIP - various fixes to force 16-byte alignment 2011-12-19 18:17:18 -05:00
Dave Parks c0b4ec6fe7 SH-2694 Fix for FPS drop when mousing over flexi objects (don't use an octree for flexi raycast) 2011-12-16 17:43:30 -06:00
Brad Payne (Vir Linden) e62ad2bf13 SH-2789 WIP - tests for alignment 2011-12-15 19:26:03 -05:00
Brad Payne (Vir Linden) e4a1b12e7a SH-2789 WIP - build without tcmalloc, force alignment in various places 2011-12-15 12:48:07 -05:00
Brad Payne (Vir Linden) e68d5e248f SH-2789 WIP - add asserts to check object address alignment where needed 2011-12-14 16:18:19 -05:00
Dave Parks 76bd8cee11 SH-2644 Fix debug display that shows selection triangle count and streaming cost 2011-11-10 14:48:48 -06:00
Dave Parks db7924681d SH-24114 Remove unused vectorization code (outdated/unused with SSE2 requirement and llvetor4a et al) 2011-11-08 17:46:43 -06:00
Richard Linden f3c0bbf162 Automated merge with http://hg.secondlife.com/viewer-development 2011-10-26 11:53:01 -07:00
Leslie Linden 17194cab5d Removed text spam about range of spatial partition, per davep. 2011-10-26 09:55:57 -07:00
Dave Parks c0ca8e5e2e Merge backout of b782a75c99e6 2011-10-14 11:58:35 -05:00
Dave Parks 4331c112ab Backed out changeset b782a75c99e6 2011-10-14 11:52:40 -05:00
Brad Payne (Vir Linden) 4b269f67ea merge 2011-09-14 14:54:20 -04:00
Brad Payne (Vir Linden) b2853c1a74 merge 2011-09-13 12:11:11 -04:00
Leslie Linden 1c7b1532e9 Merge from viewer-experience 2011-09-08 10:55:48 -07:00
Brad Payne (Vir Linden) 08c0de785f merge 2011-09-06 09:42:11 -04:00
Richard Linden fc45e9cbf6 Automated merge with http://hg.secondlife.com/viewer-development 2011-09-02 20:24:06 -07:00
Xiaohong Bao 749d9ebadc Merge 2011-08-31 10:48:56 -06:00
Xiaohong Bao 8cef480b96 fix for SH-2311: crash at LLVOVolume::lineSegmentIntersect line 3435
and SH-2358: Crash in LLError::crashAndLoop: Invalid face index
2011-08-29 18:15:38 -06:00
Leslie Linden 8961d10a2a Merge from viewer-experience 2011-08-23 13:11:14 -07:00
Richard Nelson 56453f2982 EXP-1129 FIX SLURLs with only 2 coordinates are interpreted as center of sim
reviewed by Leslie
2011-08-22 13:16:58 -07:00