8b4b2e375d
Fix for line endings style (dos2unix).
...
Updated header blocks for llphysicsshapebuilderutil classes.
2011-05-03 15:31:30 -04:00
a25f898703
merge
2011-05-02 14:52:12 -05:00
89216a6c21
Merged with viewer-development.
...
The reason was to manually resolve a couple of merge problems, as upstream has had several changes since this was applied, and some of the changes overlapped.
2011-04-29 14:23:27 -07:00
ca186a6401
Parenthisized a #define to make it safer, adjusted some notes (and added a TODO) around some extremely obscure code that needs further attention but which is outside this scope.
2011-04-04 10:24:43 -07:00
b2ade764a9
merge latest avatar-physics updates
2011-03-24 13:25:12 -04:00
fb1facf13a
syncing up to viewer-development
2011-03-24 13:22:43 -04:00
2d43a5231d
fix DOS line endings
2011-03-21 09:33:51 -04:00
7e3c32308c
merge out 2.6.0 changes from viewer-development
2011-03-18 08:08:12 -04:00
35b61cdd44
Pull from jenn_linden/viewer-vs2010
2011-03-14 22:52:11 -07:00
5038c068ea
SOCIAL-695 FIX clicking on world to give it focus will make your avatar walk
2011-03-14 12:39:50 -07:00
d4d292258e
Squared all dist_vec() based comparisons and other dist_vec() operations where sensible.
...
Not all instances of dist_vec() were squared, only those where it wouldn't (hopefully) change the functionality.
2011-03-10 22:07:06 -08:00
12b0b52b99
merge
2011-04-19 12:37:27 -05:00
8807496ed7
attempted fix for linux build
2011-04-08 02:11:46 -05:00
f90eb750f1
SH-1292 Remove outliers from graphs in scene console to make a more useful view.
2011-04-07 00:29:02 -05:00
47781184fc
Automated merge up from viewer-development into mesh-development
2011-04-04 10:42:52 -04:00
1ff7968312
SH-1225 Add skinning info to import path of .slm files.
2011-03-28 23:50:23 -05:00
6ff87e2840
SH-1169 Import from slm instead of dae when appropriate.
2011-03-22 17:23:48 -05:00
51a4867ae6
SH-1168 Export upload data to disk on upload.
2011-03-21 17:31:25 -05:00
037a83cd47
Automated merge up from viewer-development into mesh-development
2011-03-16 14:54:56 -04:00
8dffedb246
merge from lindenlab/viewer-development
2011-03-03 10:38:39 -08:00
19e99a5c09
Automated merge with file:///Users/oz/Work/V-D
2011-02-19 07:34:35 -05:00
9e0ee4dff0
SH-1006 Quick pass at cutting down the number of redundant GL calls based on data from gDEBugger.
...
Reviewed by Nyx.
2011-02-17 17:18:57 -06:00
893690bb4f
fix dos line endings
2011-02-16 20:58:49 -05:00
e3ed1565f8
Automated merge up from viewer-development into mesh-development
2011-02-10 10:44:21 -05:00
a242129b57
SH-523 Fix for non-finite values in silhouette rendering resulting in silhouette segments pointing at center of screen.
2011-02-08 15:53:50 -06:00
634f152004
merge up to latest viewer-development
2011-02-08 11:57:38 -05:00
ee2aebfaf3
merge up to lastest upstream
2011-02-11 12:54:12 -05:00
d08372f71d
merge fix for SH-659 from v-d to mesh: small textures not loaded
2011-02-01 12:43:12 -07:00
c7d0fab7b9
Fixes for merge up from viewer-development to mesh-development.
...
Backed out SH-659 since merge was messy; this will be merged in manually later.
2011-02-01 12:33:39 -05:00
fbc6e5d639
Automated merge up from viewer-development into mesh-development
2011-02-01 11:28:22 -05:00
fefc37e92f
SH-808 making sure the 10m vs. 64m scale limit switch happens for both the spinner and the manipulation tools etc.
2011-01-28 16:39:02 -08:00
8b2b0ba2df
Automated merge with file:///Users/oz/Work/V-D
2011-01-25 17:11:56 -05:00
cb5957117f
fix warnigs caused by skipping test.
2011-01-24 09:09:45 -08:00
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
3c053b3fdb
SH-534 Fix for various bump map glitches.
2011-01-21 16:23:44 -06:00
4260182b5b
Skip LLMatrix3::orthogonalize test which appears to failing in platform-dependent ways.
2011-01-20 17:07:14 -08:00
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
f3493d4165
SH-822 Fix for crash in cacheOptimize (U16 should have been a U32)
2011-01-19 23:14:41 -06:00
c602fed9b7
fix for SH-659: small textures not loaded
2011-01-18 14:08:21 -07:00
b01ca1293b
merge up to latest viewer-development
2011-01-13 11:14:13 -05:00
584c7ecb4e
Automated merge up from viewer-development
2011-01-13 10:28:15 -05:00
c8457f2664
STORM-807 : Clean up code as discussed with Andrew
2011-01-10 18:01:16 -08:00
1b7bd5e2d0
merge
2011-01-07 15:22:33 -08:00
d23f7df822
merge
2011-01-07 15:22:22 -08:00
f0d0096cf9
merge
2011-01-07 13:48:22 -06:00
ce5dc4d42b
SH-762 Forsyth style vertex buffer optimization for meshes.
2011-01-07 13:47:50 -06:00
b30ff3fb9a
Automated merge up from viewer-development
2011-01-06 11:06:09 -05:00
e3204165b9
automated merge
2010-12-30 22:09:16 -08:00
ca9df698db
Code review fix from davep - use booling or operator and not binary one
...
Remove unnecessary state check.
Initial dialog work for showing physics cost in upload dialog
2010-12-30 22:08:25 -08:00
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
Loren Shih