df1c6d2a2e
Automated merge from mesh-development
2011-01-05 15:10:31 -05:00
0278321345
SH-741 FIXED Mesh assets cannot be dragged into notecards
...
Added DAD_MESH to list of text editor -allowed drag and drop types.
Minor tab reformatting.
2011-01-05 15:08:50 -05:00
dfddccd65d
merge
2011-01-05 14:10:18 -05:00
c20f9342b9
patch for gl_any_samples_passed missing define on mac
2011-01-05 14:09:19 -05:00
b70a8ee0da
fixed line endings again
2011-01-05 10:37:28 -05:00
a7db3b1786
merge
2011-01-05 10:37:00 -05:00
875d36b083
merge
2011-01-05 01:23:37 -06:00
9c31fd79fc
SH-571 Fix for mesh shadows blinking on LoD switch.
2011-01-05 01:21:04 -06:00
c876e78c10
trival: fix compiling errors for Linux.
2011-01-04 17:51:58 -07:00
808cd0fcbf
VWR-21927 Fix for water reflections causing LoD updates.
...
SH-735 Potential fix for ATI X1950 wasting time in occlusion culling.
2011-01-04 18:34:27 -06:00
4a29253a59
Automated merge with http://hg.secondlife.com/mesh-development
2011-01-04 16:50:42 -07:00
83eb22f736
SH-739 Meshes can no longer be moved into subfolders of the "Meshes" folder
...
Did this ever work? The code for handling drag&drop is broken completely for meshes; you can't drag them anywhere in inventory.
Also did some formatting/cleanup of related code.
2011-01-04 18:41:36 -05:00
f1b7fce1db
a debug tool to detect LLPointer issues for SH-694: check if there are any other LLPointer issues in the mesh model uploading flow and fix them if exist.
...
This debug tool is off by default. To turn it on, set LL_REF_COUNT_DEBUG to be 1 in the header file "llcommon/llrefcount.h".
2011-01-04 16:28:40 -07:00
961e50aab4
clear some LLPointer issues for SH-694: check if there are any other LLPointer issues in the mesh model uploading flow and fix them if exist.
2011-01-04 16:22:38 -07:00
2729360a2d
Automated merge from mesh-development
2011-01-04 17:24:06 -05:00
8eda31456a
fixing mac build error
2011-01-04 10:18:15 -08:00
5fe826945c
Automated merge from mesh-development
2011-01-04 11:00:14 -05:00
1e647e2cd2
Faster occlusion queries (take advantage of GL_ARB_occlusion_query2 where available and don't read back result if it will block).
2010-12-31 18:41:54 -06:00
33d9b10fbb
SH-727 Working cancel button and cancel buttons for physics decomp stages.
2010-12-31 16:48:50 -06:00
350a736d37
Merge
2010-12-31 12:55:04 -08:00
d196348d0f
Physics stage of wizard
2010-12-31 12:53:39 -08: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
f41b53059e
SH-508 Fix for frame stalls when adjusting skin weights.
2010-12-30 16:46:56 -06:00
13ec64e0e6
SH-714 Fix for skinned meshes being incorrectly scaled.
2010-12-30 16:07:18 -06:00
e68b03260f
Automated merge up from viewer-development
2010-12-30 16:30:36 -05:00
3348a1ecc0
line endings broken again
2010-12-30 14:53:54 -05:00
cc3f0d287c
Automated merge from viewer-development
2010-12-30 13:11:44 -05:00
fad456e2b1
SH-647 Switch asserts to warnings in octree for development builds (were already warnings in release builds).
2010-12-29 16:29:34 -06:00
6262c4a427
SH-632 Fix for auto generating mesh LODs sometimes reducing High LOD triangle count.
2010-12-29 15:48:59 -06:00
842dcb7e42
automated merge
2010-12-29 13:16:36 -08:00
e70ca1c391
merge kdu unit tests (storm-744)
2010-12-29 15:29:58 -05:00
c26eaf53f8
SH-702 Broken Window: rename shader_heirarchy.txt to shader_hierarchy.txt
...
Trivial rename (file is an unused doc file).
2010-12-29 15:19:43 -05:00
93ee0b044f
merge
2010-12-29 14:08:47 -05:00
5f99331f4a
Automated merge up from viewer-development
2010-12-29 13:23:02 -05:00
ed365b9c0e
Automated merge from mesh-development
2010-12-29 13:07:32 -05:00
3c91317a2b
SH-652 Viewer crash when right-clicking an avatar while in edit mode
...
Null pointer issue.
2010-12-29 13:07:13 -05:00
28b628ab7b
allow run-time query of which timer function is being used
2010-12-29 10:03:33 -05:00
bf1d42ff96
STORM-744 : Make getMetaData pass when all is stubbed
2010-12-28 20:00:06 -08:00
5ed4046df5
STORM-744 : Throw exception consistently so llkdu fails consistently
2010-12-28 18:32:07 -08:00
d83314ad3f
STORM-744 : Fix release building issue
2010-12-28 15:58:37 -08:00
087c105317
STORM-242 : pull into viewer-development
2010-12-28 13:21:58 -08:00
5b52a801c6
STORM-805 : pull into viewer-development
2010-12-28 13:19:43 -08:00
cc11129afb
STORM-682 : pull into viewer-development
2010-12-28 13:15:07 -08:00
e4336b63b6
STORM-242 ADDITIONAL_FIX One more build fix...
2010-12-28 19:01:57 +02:00
d790003055
STORM-242 ADDITIONAL_FIX Fixed release build and error handling.
2010-12-28 14:30:52 +02:00
76e70a0da6
Automated merge with file:///Users/oz/Work/viewer-development
2010-12-28 06:58:04 -05:00
0b74df6774
STORM-523 : pull into viewer-development
2010-12-27 21:21:01 -08:00
4d296c19e5
STORM-242 FIXED Fixed incorrect release notes URL in the "You just entered a region using a different server version" notification.
2010-12-27 21:47:06 +02:00
061c3a5ab6
VWR-20879: Allow find_vc_dir() to work with VCExpress
2010-12-27 12:18:19 +00:00
Loren Shih