Commit Graph

98 Commits (8243d30f02abd56dc2abdc1925f16ccf81fbbb49)

Author SHA1 Message Date
Tank_Master 93d4b47252 Merge LL 3.4.1 beta 10 2012-10-26 09:59:19 -07:00
Dave Parks c97730988e MAINT-1721 Fix for crash when clicking "back" button after editing appearance.
Reviewed by VoidPointer
2012-10-15 15:59:41 -05:00
Merov Linden 91094d92a7 SH-3060 : Implement new byte range computation, cleaned up use of compression rate as well. 2012-04-05 22:05:00 -07:00
Brad Payne (Vir Linden) 131fb9219e SH-3044 FIX - change avatar log message to LL_DEBUGS to allow effective toggling when default is INFO 2012-03-16 10:55:42 -04:00
Brad Payne (Vir Linden) 3f4bca6887 SH-3044 - tag avatar log messages LL_INFOS(Avatar) 2012-03-16 10:31:15 -04:00
Tank_Master 991d43709c merge LL 3.3.3 beta 2012-06-16 07:22:27 -07:00
Brad Payne (Vir Linden) 89752e7649 SH-2968 WIP - more logging 2012-02-17 16:38:08 -05:00
Nicky 1714747536 After merge compare FS tree agsindt V/dev.
- Adjust whitespaces/include order to make FS source look as close to V/dev as possible.
- Include source in V/dev that's not in FS and comment it out with an annotation.
2012-01-18 19:04:59 +01:00
Nicky 161c1b019f Merge up from 24496 / a656486925e8 (FS tip) to 25952 / 931cb0061118 (V/Dev FUI tip)
Observations and broken stuff so far:
- LLSideTray is gone.
- LLBottomTray is gone.
- LLFloaterSnapshot was changed and gave lots of merge conflicts. Flickr upload will be broken.
- LLNearbyChat is derived from LLPanel now. That broke quite some stuff rearding autohiding and docking of chatbar.
- Profile floaters are gone and all web based now.
- Russian translation gave huge mere conflicts with the new russian xml files from LL. Unmergeable. I took the LL files.
- XUI files in general will need some love and testing.
2012-01-17 17:57:52 +01:00
Dave Parks 2179e1c1f2 SH-2541 Fix for speckles on avatar on some cards -- don't use "maximum_alpha" for alpha tests in shaders as it was always being set to 1.0 anyway. 2011-11-02 13:13:38 -05:00
Dave Parks 9ea41c8094 SH-2243 No deprecated calls for the whole session. 2011-09-20 00:54:37 -05:00
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
Arrehn 9fd0edb326 Initial 2.8.3+ merge, Tozh & Arrehn
Issues: Graphics preferences tab, lighting, depth of field
Issues: Color preferences tab, new direct chat
Issues: Build floater Mesh build tab
Issues: German translations of build, viewer menus
Issues: pipeline issues with mac, possibly other things
Issues: uploading content / temp content
Issues: Windlight quickprefs, parcel windlight, RLVa windlight
2011-08-26 11:18:49 -04:00
Tank_Master a6237bf328 Kill yet more spammy useless debugging messages. 2011-03-08 11:55:26 -08:00
Tonya Souther fb6a60ea1b Thickbrick Sleaford's patch to retry failing baked texture uploads. Fixes VWR-24889. 2011-02-17 10:21:56 -06: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