718f6fa0ff
merge LL 3.6.1
2013-07-10 00:23:23 -07:00
d4640277d0
Merge LL 3.5.3 release.
2013-07-09 16:24:58 -07:00
ccd04cd66c
Occlusion culling overhaul.
2013-06-18 17:24:21 -05:00
7b28a9a541
Remove some now useless assertions.
2013-06-13 14:38:51 -05:00
01f595d871
Speculative fix for tangent calc asserts on Mac
2013-06-11 12:02:54 -07:00
d09f1e7117
NORSPEC-242 Followup, fix a couple more sources of NaN and infinity.
2013-06-10 16:01:53 -05:00
ddf15867e4
NORSPEC-242 Fix for infinity and NaN showing up in tangents and texture coordinates sometimes.
2013-06-07 16:18:37 -05:00
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
ddd5659f81
merge changes for DRTVWR-294
2013-04-19 10:11:29 -04:00
bf6182daa8
Update Mac and Windows breakpad builds to latest
2013-03-29 07:50:08 -07:00
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
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
c06c35609c
Updating linux build to gcc4.6
2012-10-11 00:09:04 +00:00
4127f3e7fc
reapply efcec3eb374f: MAINT-646 Factor std::vector out of lloctree
2012-09-20 09:48:56 -04:00
cf98064700
reapply 52b6c9168974: MAINT-646 Factor std::set out of lloctree
2012-09-20 09:48:55 -04:00
9ec263d2f1
MAINT-1503 Minimal set of changes needed to safely disable tcmalloc
2012-09-12 15:44:36 -05:00
97d969a338
initial attempt to restore changes that make removing tcmalloc possible; not tested
2012-09-12 14:36:37 -04:00
a766e26db4
Backing out the changes contributing to DRTVWR-167 and DRTVWR-179 from the repository.
2012-09-10 10:37:02 -07:00
980d5a7555
MAINT-1503 Fix for ll_aligned_realloc returning non-aligned pointers on linux
2012-08-31 16:30:58 -05:00
8e4d6926af
Convert to Unix EOL.
2013-03-23 13:02:36 +01:00
7fab30cab4
update NACL Graphics crasher protection code. (work done by Chalice of NACL - 26104; 1799bdb6549e)
2013-03-20 10:11:16 -07:00
6207030884
Merge FS LGPL tip
2013-02-23 17:09:53 -08:00
e1ee0494bf
Merge FS LGPL
2013-02-08 00:14:47 -08:00
ea86bb88c3
first pass merge
2013-02-04 10:52:32 -08:00
169263d8b0
Merge LL 3.4.5 beta 3
2013-01-28 01:56:00 -08:00
1195f259ba
Added megaprim crash fix in octree from NaCl / Chalice Yao
2013-01-27 15:28:15 +01:00
93d4b47252
Merge LL 3.4.1 beta 10
2012-10-26 09:59:19 -07:00
173d0fa213
Pull in viewer-development because it's painful. Merge with runitai's help.
2012-07-11 16:15:23 -07:00
b7555a3309
Merge back viewer-lion, which has viewer-development and down-stream fixes
2012-08-01 14:07:24 -07:00
4a5ad35793
MAINT-570 Remove unused memory tracking system LLMemType
2012-07-20 11:42:15 -05:00
999bd2130e
Merge LL 3.4.0 release
2012-09-13 15:19:30 -07:00
d9c7b9253d
merge LL 3.4.0 viewer-beta
2012-08-31 00:18:30 -07:00
6dd3840b44
MAINT-646 Factor std::vector out of lloctree
2012-06-05 13:32:18 -05:00
92ee373e45
MAINT-646 Factor std::set out of lloctree
2012-06-05 12:55:17 -05:00
542975b4c6
merge
2012-06-04 16:19:18 -04:00
e61c20d499
Merge LL 3.3.1 Viewer Release
2012-04-26 17:31:35 -07:00
635a264e6f
merge
2012-02-08 11:22:52 -05:00
2ed1de224a
Automated merge with http://hg.secondlife.com/viewer-development
2012-02-06 15:28:45 -08:00
b9376ab990
merge
2012-02-02 10:57:09 -05:00
5a14a67e06
converted a bunch of narrowing implicit conversions to explicit
2012-02-01 13:03:46 -08:00
18e7f1bffd
SH-2889 Add visual auto-muting controls
2012-01-20 16:42:57 -06:00
ce608c6839
Optimize calculation of estimated triangles / LOG. Reuse old value if input parameters did not change.
2012-02-05 15:07:48 +01:00
9f7c9cffa3
Merge up to 26380 / 19ccfae26929 (V/dev tip).
2012-02-02 19:38:24 +01:00
c8682722ad
SH-2789 WIP - aligned alloc and realloc
2011-12-21 17:02:47 -05:00
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
e68d5e248f
SH-2789 WIP - add asserts to check object address alignment where needed
2011-12-14 16:18:19 -05:00
161c1b019f
Merge up from 24496 / a656486925e8 (FS tip) to 25952 / 931cb0061118 (V/Dev FUI tip)
...
Observations and broken stuff so far:
- LLSideTray is gone.
- LLBottomTray is gone.
- LLFloaterSnapshot was changed and gave lots of merge conflicts. Flickr upload will be broken.
- LLNearbyChat is derived from LLPanel now. That broke quite some stuff rearding autohiding and docking of chatbar.
- Profile floaters are gone and all web based now.
- Russian translation gave huge mere conflicts with the new russian xml files from LL. Unmergeable. I took the LL files.
- XUI files in general will need some love and testing.
2012-01-17 17:57:52 +01:00
76bd8cee11
SH-2644 Fix debug display that shows selection triangle count and streaming cost
2011-11-10 14:48:48 -06:00
4b269f67ea
merge
2011-09-14 14:54:20 -04:00
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
Tank_Master