Commit Graph

84 Commits (7c95af74f195c9ec4ebc0fc0264d98cd4a85be49)

Author SHA1 Message Date
Dave Parks 7c95af74f1 SH-2243 work in progress -- application side matrix stack management 2011-09-14 16:30:45 -05:00
Leslie Linden bf0d36bf88 Mac rendering now with 100% fewer crashes when enabling shadows. 2011-08-24 15:41:00 -07:00
Dave Parks 14f6bbadef SH-2242 Work in progress migrating to glVertexAttrib everywhere 2011-08-08 15:29:23 -05:00
Dave Parks 6469f1c2f2 SH-2031 High risk changeset, but potentially high reward. Addresses frame stalls in renderer by never using the fixed function pipeline if shaders are available. 2011-07-17 00:24:08 -05:00
Thickbrick Sleaford 1a44e5b3e9 FIX STORM-1325 Retry bake uploads in case of upload failure 2011-06-15 21:19:12 +03:00
Tofu Linden e416840f85 Backed out changeset c3d41f18ce2b
back-out the back-out for this branch.  yay.
2010-08-24 19:22:00 +01:00
Tofu Linden 98cc236503 Backed out changeset a62bf7c0af21
Backing out this merge that I pushed (prematurely) to the wrong place.
2010-08-24 18:44:39 +01:00
Tofu Linden 6ba23344c9 merge heads. whew. 2010-08-24 18:37:53 +01:00
Nyx (Neal Orman) fe37d350b4 EXT-8542 FIX (?) Avatar goes nude on teleport / outfit change
Believed fix, but having difficulty reproducing to verify.
changed logic in switching avatar textures so that we don't use the local
baked texture until we have at least the lowest LOD for each clothing texture.

Will ask Dan to help verify the fix.

Code reviewed by Seraph
2010-08-18 10:46:40 -04:00
Oz Linden 06b0d72efa Change license from GPL to LGPL (version 2.1) 2010-08-13 07:24:57 -04:00
Loren Shih 0f3286af36 EXT-8550 DONE Rewrite "You [ACTION] a [RESOLUTION] baked texture for '[BODYREGION]' after [TIME] seconds." for localization
Split this into two messages to take out ACTION as requested.
2010-08-04 10:21:20 -04:00
Loren Shih 94fde578cd EXT-8135 FIXED Textures blurry when in Appearance Edit mode
Trivial fix to correct for wrong debug message printed out due to use of wrong timer.
2010-07-15 17:54:09 -04:00
Loren Shih 020b156299 EXT-8135 FIXED Textures blurry when in Appearance Edit mode
EXT-8445 Reduce baked texture timeout fro 120sec to 60sec default

Also did some minor infrastructure cleanup, added code comments, etc.  There is now separate logic for determining how to handle update (versus upload) requests.
Also made a trivial change to llvoavatar to properly encapsulate mAppearanceAnimating.
Also reduced the baked texture timeout to 60s (in settings.xml)
2010-07-15 17:24:12 -04:00
Loren Shih 1d683a65a2 EXT-7818 FIXED Click on Take Off on my shoes fro inventory doesn't remove shoe
Added additional logic to tell if you're in edit outfit mode, removed some bad code that was causing removed wearables to never send out an appearance update.
2010-06-24 14:45:36 -04:00
Loren Shih 82f8be5ca3 EXT-7626 FIXED INFRASTRUCTURE LLTexLayer code cleanup
Cleaned up readBackAndUpload and added better comments.
2010-06-04 16:32:18 -04:00
Loren Shih 36a10312a5 EXT-7526 WIP Add baked texture information to texture view
More informative logic added in to track when an upload is actually happening.
Did some minor reformatting.
2010-06-04 14:56:24 -04:00
Loren Shih cfc98d7e37 EXT-7526 WIP Add baked texture information to texture view
Minor logic fix for status display.
2010-06-04 14:17:13 -04:00
Loren Shih f457eaf67d EXT-7526 WIP Add baked texture information to texture view
Added color, emphasis, and more information to texture view.
2010-06-04 14:14:36 -04:00
Loren Shih 4ec55cdb5b EXT-7504 WIP Force decloud after timeout using lower res textures
Trivial change to texture debug readout.
2010-06-04 13:14:41 -04:00
Loren Shih 6a3ff07783 EXT-7504 WIP Force decloud after timeout using lower res textures
Added fix for logic behind resetting upload timer.
2010-06-04 12:56:17 -04:00
Loren Shih 14fc336c3b Added explicit cast to U32 for texture_timeout_threshold for Linux build. 2010-06-03 14:58:38 -04:00
Loren Shih cd6db16b6a Added explicit cast to U32 for texture_timeout_threshold for Linux build. 2010-06-03 14:56:33 -04:00
Loren Shih 4f95701895 EXT-7504 WIP Force decloud after timeout using lower res textures
EXT-7626 FIXED LLTexLayer header file cleanup
EXT-7628 FIXED Don't cache lower res baked textures

Added more information into the texture debug view.
Mangled hash when uploading lower res baked textures so they're not cached
Lots of superficial cleanup on lltexlayer and associated classes.  Removed some unused functions and member variables as well.
2010-06-03 14:25:32 -04:00
Loren Shih 609c389b89 EXT-7526 WIP Add baked texture information to texture view
EXT-7504 WIP Force decloud after timeout using lower res textures

Better formatting for baked texture information.
Also added exponential timeout for sending low res baked textures.
2010-06-02 17:30:34 -04:00
Loren Shih b1514dc191 EXT-7504 WIP Force decloud after timeout using lower res textures
Added more information into the texture debug view.
2010-06-02 14:27:10 -04:00
Loren Shih 7ea46b968c EXT-7504 WIP Force decloud after timeout using lower res textures
Changed timeout behavior to be recurring, so that low res textures are uploaded every X seconds as needed.
2010-06-01 16:06:42 -04:00
Tofu Linden 1ec70d45e4 minor typo fixes: texure->texture 2010-05-29 06:23:16 +01:00
Loren Shih 7efaa216a1 EXT-7504 WIP Force decloud after timeout using lower res textures
Code cleanup.
Some minor changes in logic for when low res texture is used.
Added more metrics to notifications and texture debug output.
2010-05-28 16:45:23 -04:00
Loren Shih df853b1066 Fix for compile error in lltexlayer.cpp 2010-05-28 15:01:22 -04:00
Loren Shih e89611291e EXT-7504 WIP Force decloud after timeout using lower res textures
EXT-7526 FIXED Add baked texture information to texture view

First attempt at low res textures after timeout.
Added debug setting to control whether low res texture timeout is used.
Added baked texture load information to texture view debug display.
Trivial name changes to some variables.
2010-05-27 18:59:28 -04:00
Loren Shih 00d534d7a7 EXT-7480 Add debuga bility to set texture discard levels
Added TextureDiscardLevel override for specifying texture discard levels.
Aesthetic change to add debug- flag to all avatar debug reporting metrics.
2010-05-25 14:56:45 -04:00
Nyx (Neal Orman) b416dcb73b adding verbose logging around your own avatar rez time. Documents load times
for each component texture at each discard level, as well as baked texture
upload times, and reports the timing of each texture to the console when your
avatar sends out its appearance data to the server.

Reviewed by Seraph, will be removed before release.

 -Nyx
2010-05-18 10:20:44 -04:00
Loren Shih adc0aba2dd EXT-7305 : FIXED : Changed LLWearableDictionary to LLWearableType
Refactored LLWearableDictionary to look more like LLAssetType/LLFolderType/etc. in terms of code design.  This required a lot of superficial changes across many files.  Overall functionality has not changed.
2010-05-11 15:08:29 -04:00
Loren Shih 85f54aca0f automated merge 2010-04-13 16:39:12 -04:00
Loren Shih 88782e7546 EXT-6840 : Miscellaneous Avatar Debug Textures Floater improvements
Changed "Debug" into "Debug Textures" on right-click menu.
Added "Debug Textures" to right-click menu for self (so you don't need to CTRL+SHIFT+ALT+A).
Prettied up the dump textures console output.
Fixed a bug where component textures for yourself were showing up when viewing others (you shouldn't see any component textures when viewing others).
Enlarged debug textures floater a bit.
2010-04-13 16:36:48 -04:00
Tofu Linden 9fbe736774 (slightly hairy) merge from viewer-hotfix 2010-04-12 11:03:16 +01:00
Xiaohong Bao 0dee7a3ece debug code for EXT-6791: Intel 965 Crash in glCopyTexSubImage2D. 2010-04-09 22:02:32 -06:00
Loren Shih 58d76a9ecf EXT-6536 : Make LLVOAvatarSelf a singleton
Superficial cleanup to replace all instances of "gAgentAvatar" with "gAgentAvatarp".
2010-03-29 12:11:51 -04:00
Loren Shih 94e6e10739 EXT-6536 : Make LLVOAvatarSelf a singleton
Superficial cleanup to replace all instances of "LLVOAvatarSelf *avatarp = gAgent.getAvatarObject" with "gAgentAvatar".
2010-03-29 12:00:26 -04:00
Loren Shih 885fc3f9b5 EXT-6536 : Make LLVOAvatarSelf a singleton
Minor superficial cleanup to have all references to getAvatarObject use LLVOAvatarSelf *avatarp = gAgent.getAvatarObject()
2010-03-25 19:56:52 -04:00
Xiaohong Bao dc44d2dc1a a try to fix EXT-5845: crash on LLTexLayerTemplate::render [secondlife-bin lltexlayer.cpp:1898] 2010-03-10 18:24:02 -07:00
Nyx (Neal Orman) e1e7f78b58 EXT-5848 Getting a lot of warning spam before ATI crash
Warning was extraneous and non-related to crash. Initialized a pointer to
be NULL before calling setInfo, which seems to clear up warning.

Updated comments around this to explain what I've found

Code reviewed by Seraph
2010-03-02 14:39:08 -05:00
Nyx (Neal Orman) 587b8e737d EXT-5364 New users appear fully naked before resolving.
We were pushing off redrawing your local texture composite
while waiting for a baked texture cache response from the server.
If this happens when your textures come in, your avatar will de-cloud
but the composite will not update, resulting in nudity.

Changed the logic so we will re-generate a local composite even if
we have a pending baked texture query (we still suppress uploading the
composite until a response is received). Verified several times that this does
fix the issue. Will update the JIRA with reliable repro.

Q verified issue is worthy of a hotfix checkin

Code has been reviewed by vir, bigpapi, and seraph

This is necessary for new user experience. Patch should be contained enough to be low-risk. Contact Nyx if any further questions.
2010-02-17 11:50:13 -05:00
Tofu Linden 373f626408 CID-373
Checker: UNINIT_CTOR
Function: LLTexLayerSet::LLTexLayerSet(LLVOAvatarSelf *)
File: /indra/newview/lltexlayer.cpp
2010-01-27 16:41:11 -08:00
Tofu Linden 481bf863c2 CID-129
Checker: NO_EFFECT
Function: LLTexLayerTemplate::getLayer(unsigned int)
File: /indra/newview/lltexlayer.cpp
2010-01-27 13:49:44 -08:00
Tofu Linden a0666bdb70 Turn on llassert() and llverify() for RelWithDebInfo builds.
Convert top firing asserts into big warnings.
To be reviewed by Mani.
2010-01-21 14:42:11 -08:00
Tofu Linden c64755b23b With great sadness, disable an assert that's firing. Add comment at to why. 2010-01-19 10:50:06 -08:00
brad kittenbrink 1ea60591a9 Refactoring of llviewerprecompiledheaders.h to hopefully increase stability
and reduce unnecessary dependencies and incredibuild wedging.  Hopefully in
the long run this will reduce build time.  Also cleaned up a lot of header
file usage to conform better to the coding standard.

reviewed by james and steve.
2009-11-13 20:33:59 -05:00
Nyx (Neal Orman) 4671258569 EXT-2974 alpha mask changes are not applied immediately
Changed local compositing code for alpha masks to handle the case where
we are generating a local composite of an alpha masked body part.
See JIRA for repro information

Code reviewed by Bigpapi

--HG--
branch : avatar-pipeline
2009-11-30 15:22:03 -05:00
Nyx (Neal Orman) 52a21a301b EXT-2818 not using IMG_INVISIBLE in baked textures
this patch allows IMG_INVISIBLE in an alpha mask to set the baked texture to
also be IMG_INVISIBLE for the appropriate baked texture.

Will be post-reviewed with other alpha mask fixes.

--HG--
branch : avatar-pipeline
2009-11-24 18:25:20 -05:00