bdcb177fbb
Merge
2011-05-12 13:31:33 -07:00
4268700fcf
SH-1521 update -- Lighting and Shadows grayed out on mac
...
* Disabled SSAO on macs with 8 or less texture units.
* Slight cleanup of sunlight fragment shaders to remove unused texture units.
Reviewed by davep
2011-05-12 13:30:47 -07:00
8e8e846542
SH-1533 Fix for skybox going black under certain conditions.
2011-05-11 14:46:35 -05:00
a52019d6d1
SH-1521 FIX -- Lighting and Shadows grayed out on mac
...
* Modified mac feature table to bring it up to date with latest renderer features including deferred rendering
* Changed mac AGL pixel format to no longer allow it to revert to software rendering when shader compilation errors occur.
* Fixed up various GLSL shader compilation warnings and errors that came up as a result of the above changes.
* Changed initial conditions for the "hardware skinning" checkbox on the preferences floater so it can be modified before login on machines that support avatar vertex programs.
* Removed unused avatarAlphaF.glsl files
Reviewed by davep
2011-05-10 14:34:36 -07:00
5f6559c0f6
Automated merge with http://hg.secondlife.com/mesh-development
2011-05-09 16:45:47 -06:00
dab6d7b507
fix for SH-Render Metadata Physics Shapes on Development Client Gives Black Screen
2011-05-09 16:41:00 -06:00
847b709c27
fix for SH-1530: Viewer crash in LLSurface::getWaterHeight
2011-05-09 12:18:04 -06:00
fac4ca594f
SH-1517 Always build bounding hull from highest LoD.
2011-05-09 12:56:28 -05:00
c5fd41b232
merge
2011-05-06 17:48:24 -05:00
75cb9fde7d
Automated merge with https://bitbucket.org/davep/mesh-candidate-storm-1210
2011-05-06 16:39:17 -05:00
8a029d235e
SH-1521 Potential fix for shadows not working on mac.
2011-05-06 16:39:07 -05:00
57c8e9893e
Automated merge with https://bitbucket.org/davep/mesh-candidate-storm-1210
2011-05-06 13:40:12 -05:00
c591ea35ac
STORM-1210 Disable memory debugging to preserve alignment on debug builds.
2011-05-06 13:39:58 -05:00
39bf9be142
Featuretable tweaks to enable deferred rendering on apple.
2011-05-05 18:00:51 -05:00
a6a8426147
merge
2011-05-05 11:30:22 -04:00
a776a11ea6
Automated merge with http://hg.secondlife.com/mesh-development
2011-05-05 09:02:23 -06:00
c9f344d456
fix for SH-1437: Crash in model wizard
2011-05-04 16:27:30 -06:00
a81356f841
SH-1456 Fix for bad DoF focal point when camera is at rest.
2011-05-04 17:10:40 -05:00
fa210390b0
merge
2011-05-04 16:44:26 -05:00
5d33a55c08
SH-1455 Faster, better, more reliable disabling of DoF effect when edit menu is open and when effect is opted out of.
2011-05-04 16:44:10 -05:00
91980918f0
Fix for Sh-1481
2011-05-04 17:18:31 -04:00
f3b0b5f3f1
CTS-537 Apply tweak from Tofu Buzzard.
2011-05-04 15:43:21 -05:00
bce7b4f098
merge
2011-05-04 12:55:06 -05:00
8245e381cb
STORM-1210 Make llconvexdecomposition private
2011-05-04 12:54:07 -05:00
5eed546adf
STORM-1210 Public URLs for pcre
2011-05-04 12:45:40 -05:00
ab62af6e22
Merge
2011-05-04 12:13:02 -05:00
36c671cf15
STORM-1210 Update PCRE libs for mac and linux.
2011-05-04 12:12:42 -05:00
905fc03e5d
fix for SH-1185: uploading large mesh file sometimes fails and locks up viewer.
2011-05-04 10:11:39 -06:00
0be3b1fdd9
merge
2011-05-04 10:06:34 -04:00
a23ad02cf5
merge
2011-05-03 16:38:15 -05:00
8b4b2e375d
Fix for line endings style (dos2unix).
...
Updated header blocks for llphysicsshapebuilderutil classes.
2011-05-03 15:31:30 -04:00
a4e49310a5
STORM-1210 fsqrtf cleanup
2011-05-02 18:01:27 -05:00
c0e6d606e6
STORM-1210 : Fix python merge glitch so to pass Release build (again)
2011-05-02 15:25:24 -05:00
a25f898703
merge
2011-05-02 14:52:12 -05:00
8decd5a4e6
merge
2011-05-02 10:39:37 -04:00
50caebbad7
Added handler for final mesh object upload
2011-05-02 10:39:18 -04:00
b9bb792c47
increment viewer version to 2.6.8
2011-05-02 10:05:00 -04:00
79c89bc0e6
Added tag 2.6.7-start for changeset ce588bc1ae8e
2011-05-02 10:04:23 -04:00
1cfe556769
STORM-1215: restore INSTALL_PROPRIETARY in Release builds, remove incorrect use of LL_RELEASE_FOR_DOWNLOAD from ReleaseOS
2011-05-02 09:25:08 -04:00
5b3b0a6f2a
merge changes for storm-1182
2011-05-02 07:27:28 -04:00
2ace3d7ce4
merge changes for storm-1128b
2011-05-02 07:26:29 -04:00
818f12fbf7
merge changes for storm-380
2011-05-02 07:24:50 -04:00
a32daa0c10
merge changes for vwr-25126
2011-05-02 07:24:15 -04:00
929bde3ed0
merge changes for storm-229
2011-05-02 07:23:19 -04:00
5a280f320e
merge changes for storm-956
2011-05-02 07:19:07 -04:00
37084d7edb
STORM-1213 : pull from viewer-experience-merge
2011-04-29 18:04:23 -07:00
ee06fde193
Automated merge with http://hg.secondlife.com/mesh-development
2011-04-29 18:14:32 -06:00
a5659ac3c9
STORM-1207 and STORM-1211 : pull l10n changes from eli's repo
2011-04-29 15:43:44 -07:00
89216a6c21
Merged with viewer-development.
...
The reason was to manually resolve a couple of merge problems, as upstream has had several changes since this was applied, and some of the changes overlapped.
2011-04-29 14:23:27 -07:00
d7954ba38f
fix for SH-688: Viewer crash when uploading a large .dae file and clicking the X button in upper right hand corner of the upload model floater on Mac Build
2011-04-29 15:23:03 -06:00
Leslie Linden