Commit Graph

16092 Commits (c5de64467f33fef564f930dea156f22d59631c19)

Author SHA1 Message Date
prep linden c5de64467f Fix for Sh-780 and tweak for nametag height (Sh-638). 2011-01-12 16:11:51 -05:00
Brad Payne (Vir Linden) 86482ce1d7 merge 2011-01-11 16:42:24 -05:00
Brad Payne (Vir Linden) 997c0d3924 SH-742 FIX, SH-743 FIX: now treat requesting a specific triangle limit differently from changing some other LOD parameter, to avoid successive simplification problem 2011-01-11 16:39:28 -05:00
prep 3fcdd7f415 merge 2011-01-10 16:08:02 -05:00
prep 9c60d1da81 Fix for SH-638 2011-01-10 16:07:03 -05:00
leyla_linden b63a404613 Merge 2011-01-10 12:10:36 -08:00
Loren Shih fdf19a5268 Automated merge up from viewer-development 2011-01-10 11:20:39 -05:00
Loren Shih c4989c17ed Automated merge from mesh-development 2011-01-10 11:20:28 -05:00
prep linden e8423f150f Added support for parsing a matrix sids translation elements for joints 2011-01-10 11:04:13 -05:00
Loren Shih 6e671281a2 SH-759 FIXED Various crashes in model floater after you open file picker then cancel
Took out erroneous logic for handling when a file picker is canceled.
Reviewed by Davep.
2011-01-07 17:16:28 -05:00
Oz Linden 964e981458 merge changes for vwr-1095 2011-01-07 16:45:04 -05:00
Oz Linden 8a939212f4 merge changes for storm-826 2011-01-07 16:44:38 -05:00
Brad Payne (Vir Linden) f71228bf90 merge 2011-01-07 15:22:13 -05:00
Brad Payne (Vir Linden) 727a0e6fd4 expose << operator for LLMD5 objects in LL_COMMON_API 2011-01-07 15:20:48 -05:00
Coaldust Numbers 8cfea0bab1 VWR-1095 fix for problems with uploads following bulk upload failure
de minimus contribution accepted without CA - Oz Linden
2011-01-07 15:08:42 -05:00
Dave Parks f0d0096cf9 merge 2011-01-07 13:48:22 -06:00
Dave Parks b4c62e1a17 Clean up some xml errors from settings.xml 2011-01-07 13:48:02 -06:00
Dave Parks ce5dc4d42b SH-762 Forsyth style vertex buffer optimization for meshes. 2011-01-07 13:47:50 -06:00
Oz Linden c132d20a74 increment minor revision number to make version "2.6.0" 2011-01-07 12:46:55 -05:00
Oz Linden 4d08333dce Added tag 2.5.0-start for changeset a82e5b1e22c7 2011-01-07 12:37:00 -05:00
Oz Linden 346082965a STORM-826: fix line endings and mixed tabs/spaces 2011-01-07 11:26:16 -05:00
Oz Linden e1e38c4cee merge changes for storm-34 2011-01-07 10:39:05 -05:00
Loren Shih 61e3c95dbf Automated merge up from viewer-development 2011-01-07 10:14:33 -05:00
Loren Shih 38ab285114 Automated merge from mesh-development 2011-01-07 10:14:22 -05:00
Oz Linden 09c01c4e92 Automated merge with file:///Users/oz/Work/V-D 2011-01-06 21:38:05 -05:00
leyla_linden 5237226522 Merge 2011-01-06 16:43:57 -08:00
leyla_linden f243f7e550 added callback for updating wizard dimensions and costs from the model preview
properly enabling/disabling wizard buttons
xml ui fixes
2011-01-06 16:42:18 -08:00
Oz Linden 9833f43664 merge changes for web profiles 2011-01-06 19:20:54 -05:00
Loren Shih 1edf6b34c2 SH-700 FIXED Minor UI layout issue in Physics tab in Upload Model dialog
Shifted some elements up vertically to fit within UI box.
2011-01-06 18:00:08 -05:00
callum cf8a16366a SOCIAL-423 FIX Display name and username are wrong in My Profile tab 2011-01-06 13:41:04 -08:00
Brad Payne (Vir Linden) 8d2c4369da Validation check for edit classified and edit pick slapps 2011-01-06 16:31:27 -05:00
David Kaprielian 3f6fe6912a Syncing coverity build.sh code with trunk. 2011-01-06 13:08:00 -08:00
Loren Shih 3f0ddd758e SH-705 FIXED LOD layers error message is truncated
Expanded error message height, added linewrap.
2011-01-06 15:25:55 -05:00
Oz Linden 894e98a708 merge changes for storm-812 2011-01-06 14:33:35 -05:00
Oz Linden 94fbf99ac2 merge changes for storm-714 2011-01-06 14:32:01 -05:00
Oz Linden a9686db3e6 merge changes for storm-438 2011-01-06 14:31:17 -05:00
callum 9ece5ed510 Merge from viewer-development before merge to viewer-development request submitted 2011-01-06 10:59:41 -08:00
Nyx (Neal Orman) d8cf705d01 BUILDFIX: fixing linux build breakage
cleaning up a bit of syntax that gcc is complaining about.

reviewed by bao
2011-01-06 13:07:18 -05:00
Nyx (Neal Orman) e9e5806d67 Automated merge with https://hg.secondlife.com/mesh-development 2011-01-06 11:46:03 -05:00
Oz Linden a4d5e38535 STORM-826 (workaround): correct mixed and dos-style line endings 2011-01-06 11:06:20 -05:00
Loren Shih b30ff3fb9a Automated merge up from viewer-development 2011-01-06 11:06:09 -05:00
Loren Shih 9c6c046327 Automated merge from mesh-development 2011-01-06 11:01:17 -05:00
Loren Shih 64ca3553b1 SH-690 FIXED Name field in Upload Model dialog allows unicode charaters to be entered which shows a blank name in inventory once uploaded
Disabled unicode character input.
2011-01-06 10:59:46 -05:00
callum b9ca6c553c Merge with viewer-development 2011-01-05 15:52:43 -08:00
callum ed3ea14984 SOCIAL-304 FIX Modify side panel to reflect Profiles changes 2011-01-05 15:49:57 -08:00
Oz Linden 1034db6394 merge changes for storm-806 2011-01-05 17:54:12 -05:00
Oz Linden eb0b8ab3ea merge changes for storm-825 2011-01-05 17:53:37 -05:00
Loren Shih d5a0c56bf5 SH-716 FIXED Water reflections should not default to ON for High graphics setting
Revert to previous behavior.  Reflections stay at "minimal".
2011-01-05 17:00:07 -05:00
Loren Shih c3501a4f23 Automated merge from viewer-development 2011-01-05 16:35:09 -05:00
Loren Shih 3b1a06b024 SH-716 FIXED Water reflections should not default to ON for High graphics setting
Revert to previous behavior.  Reflections stay at "minimal".
2011-01-05 16:31:29 -05:00