fdcf43e0b3
merge
2011-07-29 17:50:20 -04:00
c013c3ab53
Removed joint Positional Compare because it was crashing on some rigs
2011-07-29 17:44:42 -04:00
0713e8c97a
BUILDFIX: fixing build for linux, casting doubles as parameters to abs
2011-07-29 17:21:27 -04:00
9d44be1903
merging in PE's fixes for new UI to mesh-development.
...
Included are upload floater tweaks, build panel tweaks,
and removing the mesh enabled checkbox in region tools.
2011-07-29 15:56:51 -04:00
762143377a
merge
2011-07-28 16:09:41 -04:00
7fc12cd43d
Fix for sh-2044, sh-2039 and sh-2166 (Avatar weights were sometimes not correctly applied upon import.
2011-07-28 16:09:17 -04:00
6c7653c65b
SH-2169 FIXED New object weights floater added.
2011-07-28 18:41:43 +03:00
ea3d58b314
SH-1868 FIXED Rearranged the accounting info to leave enough room for the upload permissions warning.
...
Removed hiding the accounting info when warning is displayed.
2011-07-27 21:20:04 +03:00
715d9f20a7
SH-1086 Make physics shape display transparent and fix some z-fighting issues.
2011-07-26 18:01:31 -05:00
f79a058f3c
SH-1874 Make UI reflect that a mesh cannot be made flexible.
2011-07-25 21:23:01 -05:00
51ccb58d31
merge
2011-07-25 21:09:58 -05:00
b27e860c1e
SH-1856 Fix for shininess not working on rigged meshes when hardware skinning is disabled.
2011-07-25 21:09:40 -05:00
9395bcee52
Fix for sh-2162
2011-07-25 17:42:22 -04:00
ce0a1f39aa
SH-1941 FIXED Mesh upload menu enabled when avatar is in the region that does not allow building but supports mesh upload.
2011-07-25 17:58:35 +03:00
4a04458ff5
Partial fix for sh-1925.
2011-07-25 10:45:05 -04:00
50b9c63382
SH-1868 WIP Added user-supplied metric data for uploading a model.
...
The mesh category string selected by user within the model data and sent to the server during calculating the upload fee and upload requests.
The accounting info and the upload permissions warning in the bottom left corner of the floater are temporarily made mutually exclusive.
2011-07-22 22:40:18 +03:00
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
74fd552256
Merge
2011-07-21 20:27:57 +03:00
f45eb335df
SH-715 Fix for bad "cancel" behavior in physics tab.
2011-07-20 17:12:49 -05:00
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
c37603d9ce
fix for sh-1847: Removed assert when a vert is outside [-5,5] domain
2011-07-20 14:05:13 -04:00
b730dd63dc
SH-2118 Fix for crash when decomposing bigfoot when SLM is in play.
2011-07-20 01:26:53 -05:00
41635a8dfd
SH-2090 Make meshes that fail to load render as prim proxy.
2011-07-19 14:18:03 -05:00
7ef1550fbb
merge
2011-07-18 23:50:50 -05:00
e8b71e0585
Changed mesh param type to not conflict with one in-use on server
2011-07-18 18:57:40 -07:00
f376ec167c
Adding support for viewer reading mesh params from an alternative param type.
2011-07-18 18:50:57 -07:00
4dc0850da7
merge changes for storm-1515
2011-07-18 15:41:14 -04:00
4adb212438
merge changes for storm-1517
2011-07-18 15:40:35 -04:00
24524bee42
merge changes for storm-1516
2011-07-18 15:39:58 -04:00
9e3c1f59d9
merge changes for storm-1510
2011-07-18 15:38:25 -04:00
26a76757f6
merge changes for beta branch tag
2011-07-18 15:37:29 -04:00
030b24188a
sync with viewer-development
2011-07-18 11:09:58 -07:00
5707ccf570
fix for SH-1904: Medallion .dae makes viewer crash during upload
2011-07-18 12:09:32 -06:00
e1eb7a26af
merge changes for storm-1510
2011-07-18 12:14:57 -04:00
5f3194be1d
reconciled .hgtags
2011-07-18 12:08:01 -04:00
67e365ba57
Added tag DRTVWR-71_2.8.0-beta1, 2.8.0-beta1 for changeset e1ed60913230
2011-07-18 11:46:24 -04:00
50d271a2ae
increment viewer version to 2.8.2
2011-07-18 08:31:32 -04:00
771ff8a764
Added tag 2.8.1-start for changeset 502f6a5deca9
2011-07-18 08:30:42 -04:00
ec2d528952
re-enable the watchdog
2011-07-18 08:30:21 -04:00
2f49b60ddc
merge changes for storm-1482
2011-07-16 08:05:26 -04:00
ae805d511d
merge late release changes and tags
2011-07-16 08:04:49 -04:00
94adbe81af
pull back late beta fix
2011-07-16 08:03:22 -04:00
1b7316c7e4
Automated merge with https://bitbucket.org/lindenlab/viewer-development
2011-07-16 05:53:34 +00:00
077bb8b39e
Automated merge with https://bitbucket.org/lindenlab/viewer-development
2011-07-15 23:39:17 +00:00
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
14a06fd1c8
Merge for STORM-1482
2011-07-15 16:26:15 -07:00
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
5267378577
fix for SH-1786: [PUBLIC] Turning off Lights and Shadows disables Glow
2011-07-15 17:01:25 -06:00
dba72d2565
storm-1510: update to new login display url
2011-07-15 17:10:36 -04:00
a517d32c48
STORM-1482 Change the defaults, look in the app_settings dir for configs as well.
2011-07-15 12:46:06 -07:00
prep linden