Commit Graph

19722 Commits (aa40614cd4cf05d3d8e78be2e05a0f5cdcfde5cc)

Author SHA1 Message Date
Paul ProductEngine aa40614cd4 SH-2101 FIXED Remove checkbox for per-region mesh disablement
- Remove checkbox for per-region mesh disablement and corresponding code
2011-07-21 20:31:00 +03:00
Paul ProductEngine 74fd552256 Merge 2011-07-21 20:27:57 +03:00
Dave Parks f45eb335df SH-715 Fix for bad "cancel" behavior in physics tab. 2011-07-20 17:12:49 -05:00
seth_productengine e0782e32e5 SH-2059 FIXED Mesh uploader UI clean up.
- When the “Load from file” radio is selected, the labels uner it are disabled.
- Added horizontal lines to LoD tab like in the physics tab.
- Physics tab: LoD dropdown moved to the left, against the “Use Level of Detail” label.
- Modifiers tab: fixed dimensions to show a z value.
2011-07-20 23:36:39 +03:00
prep c37603d9ce fix for sh-1847: Removed assert when a vert is outside [-5,5] domain 2011-07-20 14:05:13 -04:00
Dave Parks b730dd63dc SH-2118 Fix for crash when decomposing bigfoot when SLM is in play. 2011-07-20 01:26:53 -05:00
Dave Parks 41635a8dfd SH-2090 Make meshes that fail to load render as prim proxy. 2011-07-19 14:18:03 -05:00
Dave Parks 7ef1550fbb merge 2011-07-18 23:50:50 -05:00
Don Kjer e8b71e0585 Changed mesh param type to not conflict with one in-use on server 2011-07-18 18:57:40 -07:00
Don Kjer f376ec167c Adding support for viewer reading mesh params from an alternative param type. 2011-07-18 18:50:57 -07:00
Oz Linden 4dc0850da7 merge changes for storm-1515 2011-07-18 15:41:14 -04:00
Oz Linden 4adb212438 merge changes for storm-1517 2011-07-18 15:40:35 -04:00
Oz Linden 24524bee42 merge changes for storm-1516 2011-07-18 15:39:58 -04:00
Oz Linden 9e3c1f59d9 merge changes for storm-1510 2011-07-18 15:38:25 -04:00
Oz Linden 26a76757f6 merge changes for beta branch tag 2011-07-18 15:37:29 -04:00
eli 030b24188a sync with viewer-development 2011-07-18 11:09:58 -07:00
Xiaohong Bao 5707ccf570 fix for SH-1904: Medallion .dae makes viewer crash during upload 2011-07-18 12:09:32 -06:00
Oz Linden e1eb7a26af merge changes for storm-1510 2011-07-18 12:14:57 -04:00
Debi King (Dessie) 5f3194be1d reconciled .hgtags 2011-07-18 12:08:01 -04:00
Debi King (Dessie) 67e365ba57 Added tag DRTVWR-71_2.8.0-beta1, 2.8.0-beta1 for changeset e1ed60913230 2011-07-18 11:46:24 -04:00
Oz Linden 50d271a2ae increment viewer version to 2.8.2 2011-07-18 08:31:32 -04:00
Oz Linden 771ff8a764 Added tag 2.8.1-start for changeset 502f6a5deca9 2011-07-18 08:30:42 -04:00
Oz Linden ec2d528952 re-enable the watchdog 2011-07-18 08:30:21 -04:00
Oz Linden 2f49b60ddc merge changes for storm-1482 2011-07-16 08:05:26 -04:00
Oz Linden ae805d511d merge late release changes and tags 2011-07-16 08:04:49 -04:00
Oz Linden 94adbe81af pull back late beta fix 2011-07-16 08:03:22 -04:00
jenn 1b7316c7e4 Automated merge with https://bitbucket.org/lindenlab/viewer-development 2011-07-16 05:53:34 +00:00
jenn 077bb8b39e Automated merge with https://bitbucket.org/lindenlab/viewer-development 2011-07-15 23:39:17 +00:00
jenn 86a806137b After review and testing, realized that 'WatchdogEnabled' is actually true to its name, and is a boolean, not a timeout value. 'MainloopTimeoutDefault' is the actual timeout value.
Updated descriptions and values accordingly to set Watchdog timeout to 60 seconds.
2011-07-15 23:26:19 +00:00
Aaron Stone 14a06fd1c8 Merge for STORM-1482 2011-07-15 16:26:15 -07:00
Aaron Stone 5f99d30c20 STORM-1482 Always run the crash loggers, they will check what to do and how to clean up. 2011-07-15 16:25:32 -07:00
Xiaohong Bao 5267378577 fix for SH-1786: [PUBLIC] Turning off Lights and Shadows disables Glow 2011-07-15 17:01:25 -06:00
Oz Linden dba72d2565 storm-1510: update to new login display url 2011-07-15 17:10:36 -04:00
Aaron Stone a517d32c48 STORM-1482 Change the defaults, look in the app_settings dir for configs as well. 2011-07-15 12:46:06 -07:00
Brad Payne (Vir Linden) 0e22915352 merge 2011-07-15 14:10:38 -04:00
Oz Linden fc5aaf5df8 merge changes for storm-1509 2011-07-15 13:20:49 -04:00
Vadim ProductEngine 187844d5fc STORM-1506 FIXED Reset the estate to global sun when changing region environment settings.
By the way, moved estate info storage from the REGION/ESTATE floater to a model class.
2011-07-15 19:15:30 +03:00
Don Kjer fde88ae24d Potential fix for SH-1854 and SH-1125 (caps issues) 2011-07-14 18:43:49 -07:00
eli 143db44c9a FIX STORM-1494 remove duplicate ID and xml snippet 2011-07-14 15:23:23 -07:00
prep a89c58f01b Fix for SH-2061 model crashes viewer - fixed an issue where a corrupted dae would not disable the calc button 2011-07-14 17:18:53 -04:00
Aaron Stone f3dd16ac47 STORM-1482 Little bit of Windows crash report value logging. 2011-07-14 12:38:24 -07:00
Oz Linden 54bb91fd03 merge changes for 2.7.5 release 2011-07-14 14:47:15 -04:00
Debi King (Dessie) dc0765fc3d Added tag DRTVWR-66_2.7.4-release, 2.7.4-release for changeset 057f319dd8ec 2011-07-14 11:17:28 -07:00
prep 9b7165121a Fix for Sh-2047: Partial joint arrays are now able to upload 2011-07-14 11:36:32 -04:00
Dave Parks 4e61870f3a merge 2011-07-14 01:07:26 -05:00
Dave Parks 561d40d5c3 SH-715 Disable simplify/analyze button while counterpart is executing. 2011-07-14 01:07:01 -05:00
Oz Linden 4d432251e4 merge changes for storm-1507 2011-07-13 17:45:06 -04:00
Oz Linden 1f369cad59 merge changes for open-99 2011-07-13 17:43:45 -04:00
Oz Linden 21bacab562 merge changes for eli_viewer-development 2011-07-13 15:19:34 -04:00
Brad Payne (Vir Linden) ee0e23e77f merge 2011-07-13 15:02:23 -04:00