Commit Graph

19052 Commits (12e08417bfdf5d50feea544a54bbb333ad01acce)

Author SHA1 Message Date
Oz Linden fd82dee186 merge changes for storm-1324 2011-06-07 18:55:58 -04:00
Oz Linden 14f3ad4573 merge changes for storm-1323 2011-06-07 18:54:53 -04:00
prep linden c4c8e13ac5 merge 2011-06-07 16:54:13 -04:00
prep linden dbd619508b Fix for importer crashes, sh-1698. Added checks for handling bad elements in the dae. 2011-06-07 16:53:29 -04:00
Jonathan Yap 9134ec0197 STORM-899 'No attachments worn' text on blank 'Attachments' accordion remains in English for all locales 2011-06-07 16:43:38 -04:00
Dave Parks 017da5453e merge 2011-06-07 15:29:15 -05:00
Dave Parks eb85820797 SH-1595 Make rigged attachment selection more reliable (never selectable when not in edit mode, always accurately selectable while in edit mode). 2011-06-07 15:28:49 -05:00
Dave Parks e135d4d629 SH-1767 Fix for crash when viewing assets uploaded by mesh-asset-deprecation viewers 2011-06-07 15:28:05 -05:00
eli_linden d5a5238fa9 FIX VWR-20844 en_xui_change 2011-06-07 13:14:56 -07:00
Dave Parks f1784209d5 merge 2011-06-07 14:42:54 -05:00
eli_linden 815b340599 WIP INTL-50 remove obsolte translation files 2011-06-07 12:39:07 -07:00
eli_linden fe464d3cc7 WIP INTL-50 PT translation and new files 2011-06-07 12:24:21 -07:00
Dave Parks 690f18c948 merge 2011-06-07 13:59:40 -05:00
Logan Dethrow 4afd31b408 Merge VWR-25965 work. 2011-06-07 14:45:38 -04:00
eli_linden cf2b79971b FIX VWR-20841 2011-06-07 11:31:22 -07:00
Oz Linden 0de24f857a pull back late fix from beta branch 2011-06-07 05:55:04 -04:00
Dave Parks 81af06c954 Fix for crash on clicking cancel while a model is still loading. 2011-06-07 00:22:49 -05:00
Dave Parks b90bc83f3d merge 2011-06-07 00:10:39 -05:00
Dave Parks faf9693be3 Make basehull assert even more forgiving (only error out on 10% over bounds). 2011-06-07 00:10:24 -05:00
Xiaohong Bao edeb1fcc2d Automated merge with https://bitbucket.org/davep/mesh-asset-deprecation 2011-06-06 23:05:24 -06:00
Xiaohong Bao a3842d9637 fix for SH-588: Uploading a mesh crashes viewer 2011-06-06 23:04:48 -06:00
Dave Parks d58c560e72 merge 2011-06-06 19:28:10 -05:00
Dave Parks a58e70261e SH-101 Fix for asset when uploading some models. 2011-06-06 19:27:47 -05:00
Dave Parks 5cfc4764db merge 2011-06-06 19:13:08 -05:00
Dave Parks b3fbb12f15 SH-1589 Fix for some meshes showing up in non mesh enabled regions. 2011-06-06 19:12:52 -05:00
eli_linden 394190ce47 FIX VWR-20808 2011-06-06 16:52:09 -07:00
eli_linden 1d3ca94870 FIX VWR-20805 2011-06-06 16:33:33 -07:00
Dave Parks c4b7728f0e merge 2011-06-06 18:20:25 -05:00
Dave Parks aa21ad59aa Fix for crash when viewing asset with "NoGeometry" 2011-06-06 18:20:07 -05:00
eli_linden a39f6fc32c FIX VWR-18950 2011-06-06 16:10:04 -07:00
Roxie Linden 86d6c3f196 automated merge 2011-06-06 15:36:24 -07:00
Roxie Linden c24a5a3fb5 automated merge 2011-06-06 15:35:52 -07:00
Dave Parks 5f2f532aaa merge 2011-06-06 17:05:31 -05:00
Dave Parks 9793f6c51d Add "NoGeometry" identifier support to viewer. 2011-06-06 16:54:15 -05:00
Logan Dethrow 18a2c3c017 VWR-25965 Fix to two calls to LLDirIterator mask argument.
Removed two cases in llappviewer.cpp where the mask argument to LLDirIterator
had a leading delimiter.
2011-06-06 17:40:19 -04:00
Don Kjer 325c2b2169 Removed the old mesh asset upload pipeline. Fixed a problem with spamming MissingString MacLocale warnings. Reviewed by Dave 2011-06-06 21:27:29 +00:00
Oz Linden 4a8109476c STORM-1618: re-enable deferred rendering on ATI Macs 2011-06-06 17:16:14 -04:00
Roxie Linden 73bbcfb07b automated merge 2011-06-06 12:55:21 -07:00
eli_linden 156e1c1dca FIX VWR-18950 en_xui_change 2011-06-06 12:08:30 -07:00
eli_linden 20d83a03f7 sync with viewer-development 2011-06-06 11:29:21 -07:00
Oz Linden 4f794dd47e merge tags from beta branch 2011-06-06 12:02:44 -04:00
Debi King (Dessie) 18d210e9b0 reconciled .hgtags 2011-06-06 11:52:37 -04:00
Oz Linden 7a7c6860e5 increment development viewer version to 2.7.3 2011-06-06 08:50:53 -04:00
Oz Linden 02c85bd026 Added tag 2.7.2-start for changeset 9f79a6ed8fdc 2011-06-06 08:49:55 -04:00
Dave Parks 70f959f01e SH-1738 Fix for broken UI text when deferred rendering enabled. 2011-06-06 02:41:09 -05:00
Oz Linden 6b5ad9f1ec disable deferred rendering on ATI Macs until SH-1618 is solved 2011-06-04 21:07:56 -04:00
Oz Linden fe7cd2ddb0 correct license headers 2011-06-04 08:03:12 -04:00
Oz Linden 268ea7bd45 fix DOS line endings 2011-06-04 08:00:15 -04:00
Oz Linden 2c9a914d7d merge changes for storm-1318 2011-06-04 07:50:12 -04:00
Oz Linden 19250ff490 merge changes for storm-1312 2011-06-04 07:49:03 -04:00