Commit Graph

16584 Commits (ca52b0bd712483675bb04421fb4ee6881e61a135)

Author SHA1 Message Date
leyla_linden ca52b0bd71 SH-1040 Make both model preview drop downs functional 2011-02-24 15:02:55 -08:00
leyla_linden 095a321eb6 SH-1045
Mesh Viewer temporarily allows object scaling larger than 10m, then moves the object
2011-02-24 15:01:14 -08:00
leyla_linden b0e64098ba Merge 2011-02-23 16:38:45 -08:00
leyla_linden 9f537ad93f SH-1035 Model preview background color should match spec 2011-02-23 16:31:32 -08:00
Dave Parks 34428b305a SH-301 Cleanup -- accidentally removed a multiply by sDistanceFactor 2011-02-23 17:44:11 -06:00
Dave Parks 2d01424e25 SH-301 Use avatar distance and radius when calculating LoD for rigged attachments. 2011-02-23 17:02:43 -06:00
Dave Parks 74d402e59e SH-473/CTS-248 Enable mirror and invert check boxes for meshes. 2011-02-23 16:38:10 -06:00
Dave Parks 755c8d13f2 merge 2011-02-23 15:43:09 -06:00
Dave Parks 605e44a574 SH-1019 Fix bad md5sum entry. 2011-02-23 15:42:54 -06:00
Loren Shih 3d77dd6b58 Merge: Backed out changes for STORM-336 for merge due to complexity, will need to apply these manually. 2011-02-23 16:24:47 -05:00
Dave Parks c2e55df3e5 SH-1019 Attempt at removing dependency on .net framework from colladadom.dll 2011-02-23 14:17:24 -06:00
Loren Shih 701b665ee5 Fixes from merge of viewer-development -> mesh-development. 2011-02-23 13:22:51 -05:00
Loren Shih 9b50def44f Automated merge up from viewer-development into mesh-development 2011-02-23 12:50:17 -05:00
Dave Parks d46594bf71 merge 2011-02-22 18:37:04 -06:00
Dave Parks e55e91a5a5 SH-874 Better VBO usage hints, most notably don't use VBOs for occlusion queries if GL is set to not use VBOs for stream draw. 2011-02-22 18:36:50 -06:00
Dave Parks e25854fd6a merge 2011-02-22 18:33:57 -06:00
Dave Parks c690c30ec1 SH-438 Use node name instead of mesh name for object names when importing meshes. 2011-02-22 18:33:33 -06:00
Xiaohong Bao e216fabde0 Automated merge with http://hg.secondlife.com/viewer-development 2011-02-22 13:29:22 -07:00
Xiaohong Bao 2ebcf802cb set "RenderVBOMappingDisable" to be true by default to stop VBO memory leaking. 2011-02-22 13:28:48 -07:00
Xiaohong Bao 417069f152 more fix for SH-895/STORM-336: memory leaking. fixed vertex buffer caused leaking. 2011-02-22 11:22:50 -07:00
prep linden b53ffe4eae Code cleanup and removed hacky code support for some old legacy rig types 2011-02-18 17:43:08 -05:00
Dave Parks add08538af merge 2011-02-18 13:52:56 -06:00
Dave Parks cfb3ee50c2 SH-948 don't occlusion cull everything when deferred rendering is enabled 2011-02-18 13:52:40 -06:00
Loren Shih dfafbf9f12 Automated merge up from viewer-development into mesh-development 2011-02-18 10:23:08 -05:00
Dave Parks a5bc626ee3 merge 2011-02-17 17:19:13 -06:00
Dave Parks 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
Dave Parks c05f3d384b merge 2011-02-17 16:07:00 -06:00
Dave Parks cd582e3364 SH-547 Use appropriate texture channel for rendering avatars into their impostor map. 2011-02-17 16:06:34 -06:00
Oz Linden 1a79aeca54 merge changes for storm-937 2011-02-17 15:09:50 -05:00
Nyx (Neal Orman) 0ba198b94b Automated merge with https://hg.secondlife.com/mesh-development 2011-02-17 13:53:04 -05:00
Nyx (Neal Orman) 019585ed6c SH-959 FIX crash in llflexibleobject.cpp
Crash was a result of one of two possibilities:
1) trying to update geometry when it wasn't visible
2) mSimulateRes was non-zero when mInitialized was 0

Put code to handle both cases - initialize if mSimulateRes is 0 OR mInitialized is 0
But only do so if the object is visible. If the object is not visible, early out.

Code reviewed by davep
2011-02-17 13:52:58 -05:00
prep 5c2f5b0013 merge 2011-02-17 13:02:04 -05:00
prep 800e931104 Another part of the pelvis fix. Sh-634 2011-02-17 13:01:29 -05:00
Loren Shih b1e39f8544 Mesh-development work in progress 2011-02-17 10:26:28 -05:00
leyla_linden c15dc4faf3 Merge 2011-02-16 15:24:53 -08:00
leyla_linden f41f7cb607 SH-512 [REGRESSION] Linden trees scale up to 200m on Mesh regions
SH-943 10 meters maximum Prim/Mesh size in latest Mesh Viewers
2011-02-16 15:24:11 -08:00
prep fcde700447 Fix for problem with pelvis offset 2011-02-16 17:55:02 -05:00
leyla_linden 79e8ef7f51 SH-957 Turning off Atmospheric Shaders greys out Lighting and Shadows options in preferences but does not turn off shadows inworld 2011-02-16 14:45:41 -08:00
Oz Linden eacd9d5d59 merge changes for storm-981 2011-02-16 15:52:05 -05:00
prep 8bbbcd9c22 Fix for SH-816 2011-02-16 10:32:12 -05:00
Xiaohong Bao ff5e3f5c2e Automated merge with http://hg.secondlife.com/viewer-development 2011-02-15 15:43:47 -07:00
Brad Payne (Vir Linden) 7fe0d4215e merge 2011-02-15 16:50:30 -05:00
Brad Payne (Vir Linden) 344200bcd4 SH-845 FIX - wording change 2011-02-15 16:45:00 -05:00
Brad Payne (Vir Linden) a0b9fe00f6 SH-845 FIX - installer checks for SSE2 support and offers option to quit if not found (note the needed API is not present on win2k, so the check will not run there) 2011-02-15 16:43:47 -05:00
Xiaohong Bao f13884e528 partial fix for SH-895/STORM-336: memory leaking. fixed vertex buffer caused leaking. 2011-02-15 14:12:58 -07:00
Loren Shih 2d8e34c788 Automated merge up from viewer-development into mesh-development 2011-02-15 10:13:09 -05:00
Dave Parks cf728ab09e merge 2011-02-14 19:37:06 -06:00
Dave Parks 6e8115cd22 Fix for crash when enabling Debug GL (stack underflow) 2011-02-14 19:36:53 -06:00
leyla_linden 9fcc8c3161 Merge 2011-02-14 16:32:36 -08:00
leyla_linden a44b1ff511 SH-956 Turning off Basic Shaders in Preferences > Graphics does not grey out expected Shadows options in Mesh Viewer
SH-957 Turning off Atmospheric Shaders greys out Lighting and Shadows options in preferences but does not turn off shadows inworld
2011-02-14 16:31:40 -08:00