Brad Payne (Vir Linden)
cd46f4a7b9
SH-2684 FIX, SH-2716 FIX - bug was specific to running in non-english language
2012-01-27 13:56:03 -05:00
Dave Parks
5546041301
SH-2794 WIP -- work on getting glMapBuffer and friends to behave
2011-12-21 15:55:14 -06:00
Oz Linden
f1a4593e47
merge changes for vmrg-204
2011-12-12 09:04:33 -05:00
Richard Linden
c191f523a9
Automated merge with http://hg.secondlife.com/viewer-development
2011-11-30 17:57:09 -08:00
Dave Parks
85392acac0
merge
2011-11-29 14:43:09 -06:00
Richard Linden
d089e6c264
bumped up MSVC warning level to 3 to catch more stuff that gcc catches
2011-11-28 19:16:49 -08:00
Oz Linden
b69be18d7b
merge changes for vmrg-193
2011-11-24 06:56:57 -05:00
Brad Payne (Vir Linden)
810a00469a
merge
2011-11-22 09:50:29 -05:00
Brad Payne (Vir Linden)
1dd24cfcf8
SH-2614 FIX, SH-2684 FIX - fixed buggy state management in onPhysicsUseLOD
2011-11-21 17:40:12 -05:00
Dave Parks
f19f43c746
merge
2011-10-19 16:21:18 -05:00
Brad Payne (Vir Linden)
4dd15ae27d
merge
2011-10-19 11:45:42 -04:00
Dave Parks
4924f0c99b
b782a75c99e6 backout cleanup
2011-10-14 12:38:48 -05:00
Dave Parks
7b6723d1e0
SH-1650 Mitigate memory fragmentation by holding onto and reusing VBOs
2011-10-13 01:19:45 -05:00
Dave Parks
cffcb414f5
SH-2488 Fix for shiny and alpha not interacting well on rigged attachments (and fix for assertion when rendering model import preview)
2011-10-07 17:44:57 -05:00
prep linden
93e3d9e2ec
Fix for sh-2483
2011-09-30 15:40:27 -04:00
prep
69ac0d0aee
Fix for sh-2500
2011-09-28 14:52:27 -04:00
Dave Parks
bd02cdc75f
merge
2011-09-26 19:27:10 -05:00
Brad Payne (Vir Linden)
f3f841bddf
SH-2425 FIX - customized upload permissions info for damballah/staging
2011-09-26 14:41:21 -04:00
Brad Payne (Vir Linden)
75b2f61789
merge
2011-09-22 14:45:04 -04:00
prep
812b6c60ed
Fix for sh-2467
2011-09-21 15:01:15 -04:00
Dave Parks
9ea41c8094
SH-2243 No deprecated calls for the whole session.
2011-09-20 00:54:37 -05:00
prep linden
3f0a2cda29
Fix for sh-2443
2011-09-19 11:00:11 -04:00
prep linden
1a7e166104
Fix for sh-2443
2011-09-16 15:10:58 -04:00
Dave Parks
7c95af74f1
SH-2243 work in progress -- application side matrix stack management
2011-09-14 16:30:45 -05:00
Brad Payne (Vir Linden)
4b269f67ea
merge
2011-09-14 14:54:20 -04:00
prep
df40eca093
merge
2011-09-14 10:41:52 -04:00
prep
4efca483d7
Fix for CTS-804. Added support for parsing translations from Blenders(v2.5.9) transform SID's.
2011-09-14 10:41:26 -04:00
Dave Parks
c0ca2c62fd
merge
2011-09-13 16:11:22 -05:00
Seth ProductEngine
f74b7274d2
SH-2400 FIXED crash on model upload.
...
Added checks for LoD strings array index bounds.
2011-09-13 19:45:04 +03:00
Nyx (Neal Orman)
b56e4cf0e4
BUILDFIX GCC fixing unused variable
2011-09-12 14:51:22 -04:00
prep
66aabf8a4f
merge
2011-09-08 15:55:17 -04:00
prep
2e652ce660
Fix for SH-2210
2011-09-08 15:54:52 -04:00
Leslie Linden
1c7b1532e9
Merge from viewer-experience
2011-09-08 10:55:48 -07:00
Seth ProductEngine
f44b44400b
SH-2309 FIXED 'Triangles limit' combo value updating problem.
...
Fixed updating 'Error threshold' spinner control visibility.
2011-09-08 18:47:37 +03:00
Paul ProductEngine
955bcbb951
Merge mesh-development with sh-2309
2011-09-07 18:46:51 +03:00
Paul ProductEngine
bb085a45db
Merge from seth_mesh_dev to paul_mesh_dev
2011-09-07 16:15:54 +03:00
Brad Payne (Vir Linden)
08c0de785f
merge
2011-09-06 09:42:11 -04:00
Paul ProductEngine
117bd5af1b
SH-2309 FIXED Priority modifications to mesh uploader UI
...
- Replaced magic number with constant
- Commented my magic numbers
2011-09-06 16:23:53 +03:00
Seth ProductEngine
028c34e0ff
SH-2309 Model preview floater LoD tab updated.
...
- Combo boxes for LoD source added for each level
- New option "Use LoD above" added for copying the model from higher LoDs.
- Various LoD settings and related controls removed.
2011-09-02 17:36:54 +03:00
Paul ProductEngine
5da2d4c853
SH-2309 WIP Priority modifications to mesh uploader UI
...
- Changed representation of Retain% control values
- Added "Choose one..." item to the LOD combo_box
2011-09-02 17:14:07 +03:00
Paul ProductEngine
004de653aa
SH-2309 WIP Priority modifications to mesh uploader UI
...
- Bind "Cosine%" param with "Smooth" combo box.
- Corrected some wording.
- Little UI polish. Line with results in Physics tab.
- Changed ordering of LOD combo box items.
2011-09-01 19:01:46 +03:00
Xiaohong Bao
749d9ebadc
Merge
2011-08-31 10:48:56 -06:00
Paul ProductEngine
55c2207792
SH-2309 WIP Priority modifications to mesh uploader UI
...
Made next changes according to the last version of UI spec:
- Modified Upload Options tab
- Modified Physics tab
- Modified the floater overall
2011-08-31 17:02:15 +03:00
prep linden
5e5869c63a
Fix for Sh-2350
2011-08-30 14:59:52 -04:00
prep linden
71ac45a28b
Handling of material mismatches - lod materials are required to be a subset of the high lod, introduced addEmptyFace() for when parity does not exist between model material counts
2011-08-30 09:32:16 -04:00
Paul ProductEngine
124e4d5874
SH-2309 WIP Priority modifications to mesh uploader UI
...
- Updated upload floater according to the UI spec
- Updated Modifiers panel according to the UI spec
2011-08-25 21:33:10 +03:00
Paul ProductEngine
716d2bd2e4
SH-2309 WIP Priority modifications to mesh uploader UI
...
- Arranged all controls of the floater (according to the last version of the mockup) except for the tab container content.
2011-08-24 14:57:19 +03:00
Seth ProductEngine
27332685e9
Merge
2011-08-19 02:20:07 +03:00
Dave Parks
1b36b04251
SH-1180 Log which nodes are problematic when loading a .dae with mirrored meshes and report error.
2011-08-18 14:41:34 -05:00
Dave Parks
e0bf0e3e21
SH-2217 Fix for large models not getting properly clampled by importer (odd that server seems to need 240m limit instead of 256m limit)
2011-08-17 14:59:22 -05:00