Oz Linden
b2ade764a9
merge latest avatar-physics updates
2011-03-24 13:25:12 -04:00
Oz Linden
fb1facf13a
syncing up to viewer-development
2011-03-24 13:22:43 -04:00
Oz Linden
2d43a5231d
fix DOS line endings
2011-03-21 09:33:51 -04:00
Oz Linden
7e3c32308c
merge out 2.6.0 changes from viewer-development
2011-03-18 08:08:12 -04:00
Merov Linden
35b61cdd44
Pull from jenn_linden/viewer-vs2010
2011-03-14 22:52:11 -07:00
Richard Linden
5038c068ea
SOCIAL-695 FIX clicking on world to give it focus will make your avatar walk
2011-03-14 12:39:50 -07:00
Alain Linden
8dffedb246
merge from lindenlab/viewer-development
2011-03-03 10:38:39 -08:00
Oz Linden
19e99a5c09
Automated merge with file:///Users/oz/Work/V-D
2011-02-19 07:34:35 -05:00
Oz Linden
893690bb4f
fix dos line endings
2011-02-16 20:58:49 -05:00
Oz Linden
634f152004
merge up to latest viewer-development
2011-02-08 11:57:38 -05:00
Oz Linden
ee2aebfaf3
merge up to lastest upstream
2011-02-11 12:54:12 -05:00
Oz Linden
8b2b0ba2df
Automated merge with file:///Users/oz/Work/V-D
2011-01-25 17:11:56 -05:00
Alain Linden
cb5957117f
fix warnigs caused by skipping test.
2011-01-24 09:09:45 -08:00
Xiaohong Bao
4af7e9eb64
Merge viewer-development-shining up to REV 3bf724ecb7c6 (fix for SH-829: Viewer attempting to load precached images in file types that are not being used.)
2011-01-21 16:25:23 -07:00
jenn
4260182b5b
Skip LLMatrix3::orthogonalize test which appears to failing in platform-dependent ways.
2011-01-20 17:07:14 -08:00
jenn
eb2c9d224a
LLMatrix3::orthogonalize test was failing; possibly due to new lib dependencies or architecture on the build machines? Trying updating expected float values to see if it begins to pass.
...
Updated expected values to match result of query on WolframAlpha.com (mathematica):
N[Orthogonalize[{{1,4,3},{1,2,0},{2,4,2}}],8]
2011-01-20 15:58:15 -08:00
Xiaohong Bao
c602fed9b7
fix for SH-659: small textures not loaded
2011-01-18 14:08:21 -07:00
Oz Linden
b01ca1293b
merge up to latest viewer-development
2011-01-13 11:14:13 -05:00
Merov Linden
c8457f2664
STORM-807 : Clean up code as discussed with Andrew
2011-01-10 18:01:16 -08:00
Andrew Meadows
1b7bd5e2d0
merge
2011-01-07 15:22:33 -08:00
Andrew Meadows
d23f7df822
merge
2011-01-07 15:22:22 -08:00
Aleric Inglewood
9531046609
STORM-955: VWR-24312: Massively duplicated objects
...
Turns out that most of my SNOW-800 patch was included in Viewer 2 (albeit without crediting me).
However, not everything was used and some more cleaning up was possible.
After this patch, and when compiling with optimization, there are no duplicates left
anymore that shouldn't be there in the first place. Apart from the debug stream
iostream guard variable, there are several static variables with the same name (r, r1,
r2, etc) but that indeed actually different symbol objects. Then there are a few
constant POD arrays that are duplicated a hand full of times because they are
accessed with a variable index (so optimizing them away is not possible). I left them
like that (although defining those as extern as well would have been more consistent
and not slower; in fact it would be faster theoretically because those arrays could
share the same cache page then).
2010-12-30 14:53:30 +01:00
Wolfpup Lowenhar
44e6327674
STORM-825 : Reenable the LLMatrix3::orthogonalize test in llmath/tests/m3math_test.cpp
...
Removed the skipping of a working test as this was causeing a the test to fail
building and thus not actualy running all the tests.
2010-12-28 19:14:33 -05:00
Andrew Meadows
3be87bb046
ER-407 child bounding boxes not rotated properly for encroachment returnability
...
Using the correct method for joining BBoxes in the agent frame ::addBBoxAgent()
2010-12-15 11:23:00 -08:00
Andrew Meadows
64512b681e
ER-398 viewer's encroachment logic only uses bounding box of root prim
...
Adding LLBBox::join() to allow us to compute the bounding box of a linked object
2010-12-14 08:52:33 -08:00
Andrew Meadows
424786d8d0
Added viewer-side "object overlaps parcel" check encroachment returnabilty UI
...
Reviewed with Falcon
2010-11-18 15:55:53 -08:00
Loren Shih
eed7b72011
automated merge
2010-09-08 17:58:17 -04:00
Aaron Terrell (Enus)
d04e8d7575
merging up from viewer-development
2010-08-30 11:56:33 -07:00
Aaron Terrell (Enus)
48743cbd41
standardizing test suite names as class name under test
2010-08-24 23:41:47 -07:00
Tofu Linden
e416840f85
Backed out changeset c3d41f18ce2b
...
back-out the back-out for this branch. yay.
2010-08-24 19:22:00 +01:00
Tofu Linden
98cc236503
Backed out changeset a62bf7c0af21
...
Backing out this merge that I pushed (prematurely) to the wrong place.
2010-08-24 18:44:39 +01:00
Tofu Linden
6ba23344c9
merge heads. whew.
2010-08-24 18:37:53 +01:00
Loren Shih
27c855149e
First pass commit for breast physics.
2010-08-23 13:36:28 -04:00
Oz Linden
06b0d72efa
Change license from GPL to LGPL (version 2.1)
2010-08-13 07:24:57 -04:00
Kent Quirk
b770415b6a
Merge (and resolve conflict) from q/viewer-release
2010-06-17 11:37:21 -04:00
Tofu Linden
fce2653f6b
SNOW-620 PARTIAL Infinite loop in LLSphere::getBoundingSphere
...
Neither the test nor the code being tested are good - the unit test can hang. Skipping test for now, passing over to the sim maint backlog.
2010-06-15 13:26:40 +01:00
Dessie Linden
a21b7b330b
Merged from viewer-release
2010-06-11 11:51:59 -07:00
Tofu Linden
f5ae54f8c3
DEV-11516 FIXED VWR-5308: Current wind noise generation is CPU intensive.
...
Minor optimizations to wind generation. Patch by gigs and aimee, reviewed by merov.
2010-06-08 20:48:57 +01:00
Dave Parks
b740924c9d
Make LLVolume::createSide a little faster.
...
(transplanted from 4d43e3b83ccffd725ec6cb234ddcfa0833f17a9f)
2010-04-28 02:53:12 -05:00
Tofu Linden
b362cc60d9
merge from viewer-trunk
2010-04-19 14:30:43 +01:00
Tofu Linden
5dda65c030
EXT-4388 Crash in octree line segment intersection code (getMask)
...
Add yet more paranoia-and-return-or-assert, this time for +-INF in input vector.
To be reviewed by Bao.
(transplanted from 2012f21d23c66179345fb26148cfbe19835b325e)
2010-04-15 20:15:40 +01:00
Palmer Truelson
bd10ded1da
index off for tristrip fix on davep's tristrip optimization
2010-02-23 18:03:37 -08:00
Dave Parks
adf601ef1f
Draw prims using triangle strips instead of triangle lists.
2010-02-06 17:33:12 -06:00
Tofu Linden
792ebb1936
CID-423
...
Checker: UNINIT
Function: LLVolume::cleanupTriangleData(int, const std::vector<LLVolume::Point, std::allocator<LLVolume::Point>> &, int, int *, int &, LLVector3 **, int &, int **)
File: /indra/llmath/llvolume.cpp
The code looks right, I'm just adding an llassert().
2010-02-10 16:49:56 +00:00
Tofu Linden
a4aca0ba1c
CID-288
...
Checker: UNINIT_CTOR
Function: LLCamera::LLCamera(float, float, int, float, float)
File: /indra/llmath/llcamera.cpp
2010-02-03 19:00:30 +00:00
Tofu Linden
df0d43054c
CID-289
...
Checker: UNINIT_CTOR
Function: LLCamera::LLCamera()
File: /indra/llmath/llcamera.cpp
2010-02-03 18:56:37 +00:00
Tofu Linden
50f29e0bc2
Use floorf() instead of floor() when we know the param is an F32. Which here, it always is.
2010-02-01 12:01:44 +00:00
Tofu Linden
a9c4ed26e7
Try for a slightly cunning fix to CID-352
...
Checker: UNINIT_CTOR
Function: LLInterp<float>::LLInterp()
File: /indra/llmath/llinterp.h
2010-01-28 11:50:35 -08:00
Tofu Linden
f7f4dae3d8
CID-127
...
Checker: NO_EFFECT
Function: LLOctreeNode<LLDrawable>::updateMinMax()
File: /indra/llmath/lloctree.h
2010-01-27 13:56:53 -08:00
James Cook
35862b86bd
Remove inline llwarns to cut out some linker bloat.
2009-12-18 08:43:00 -08:00