Commit Graph

41 Commits (abfe05c1b3d24ed820cf084ece3f3610ec35fa21)

Author SHA1 Message Date
Brad Payne (Vir Linden) 487ca1bad3 v-r -> s-e merge WIP 2014-05-14 17:50:59 -04:00
Brad Payne (Vir Linden) 7b9708a2e3 sunshine-external merge WIP 2014-05-13 10:02:26 -04:00
Brad Payne (Vir Linden) d9e3a2948a merge 2014-03-12 17:24:07 -04:00
Richard Linden 5b846ed2a6 merge with release 2014-03-12 12:48:43 -07:00
Baker Linden d7b902d575 [MAINT-3555] Crash in LLPanel::~LLPanel() on shutdown
- Added clear() after DeletePointer() call to hopfully fix this...
2014-02-14 13:56:36 -08:00
Xiaohong Bao 0c60e32808 Merge 2013-10-21 16:57:38 -06:00
Brad Payne (Vir Linden) cecad67163 merge 2013-10-16 17:56:48 -04:00
Richard Linden 697d2e720b renamed TimeBlock to BlockTimerStatHandle 2013-10-15 20:24:42 -07:00
Dave Parks 0e116741a0 MAINT-2968 Fix for crash on AMD hardware running current drivers. 2013-10-10 18:00:11 -05:00
Nyx Linden ab0c38612f SH-2728 SH-4010 FIX pants flare issues
When wearing multiple layers of pants, the morph masks for all layers would be composited,
resulting in the smallest intersection of all layers. Instead we should only be applying the
top layer. This change will affect all consumers of the llappearance library.
2013-09-24 20:22:19 +00:00
Nyx Linden 7e7965af19 SH-3943 FIX beard morph masks applied inconsistently on login to server bake region
Looks like we were caching bad morph masks that were generated on login. Adjusting
algorithms to always replace the cache when we have invalidated the other channels
of the baked texture.
2013-09-20 15:54:26 -04:00
Richard Linden cbe397ad13 changed fast timer over to using macro
another attempt to move mem stat into base class
2013-09-05 14:04:13 -07:00
Richard Linden e340009fc5 second phase summer cleaning
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
2013-08-09 17:11:19 -07:00
Richard Linden a2e22732f1 Summer cleaning - removed a lot of llcommon dependencies to speed up build times
consolidated most indra-specific constants in llcommon under indra_constants.h
fixed issues with operations on mixed unit types (implicit and explicit)
made LL_INFOS() style macros variadic in order to subsume other logging methods
such as ll_infos
added optional tag output to error recorders
2013-07-30 19:13:45 -07:00
Richard Linden 0a96b47663 merge with viewer-release 2013-06-05 19:05:43 -07:00
Graham Madarasz c38204f5e0 Unwind cruft from hunting for 2707 they won't end up in vwr-dev-mat 2013-06-05 14:26:27 -07:00
Graham Madarasz cf3d2a06a1 BUG-2707 turn off more LL_DEBUGS to narrow down Kat's crashing cuplrit 2013-06-01 19:36:38 -07:00
Graham Madarasz d21fc254a7 BUG-2707 hunt for infos call crashing Kat 2013-06-01 13:43:52 -07:00
prep 0cda978db9 #include fix 2013-03-11 18:15:40 -04:00
prep 207d9fd767 Viewer-chui merge 2013-03-11 14:45:53 -04:00
Nyx Linden 1cf611b059 SH-3651 FIX Beard edits not applying on server bakes
Despite incrementing the COF version, beard edits were not updating the head hash.
We were not applying layers/parameters to the baked texture hashes for
layers that did not contain a user-defined image. However, many layers have standard
morph masks, etc that are affected by wearable parameters.

Edited the LLTexLayerInterface::getWearable() method to return the proper wearable type
if there is no associated local texture index, and all parameters in the wearable
refer to a particular wearable type. Should be safe even if some (but not all) params
have no wearable type defined.
2013-02-06 18:38:17 -05:00
Don Kjer 2f7901ab92 Skipping rendering of unneeded morph masks 2012-12-20 21:33:30 +00:00
Don Kjer 802e738b77 Fix for alpha blending using gl fixed-functions not matching shader implementation 2012-12-18 23:40:31 +00:00
Don Kjer 07d05c2967 Alpha rendering fixes for appearance utility. 2012-12-06 22:54:50 +00:00
prep e0432f98ee SH-3563. Pull and merge from viewer-development. Modest code changes to fix alignment issue in llAppearance. 2012-11-28 16:36:34 -05:00
Brad Payne (Vir Linden) 2234ed87e4 SH-3484 WIP - added additional logging under DebugAvatarCompositeBaked to try to track down baked texture issues 2012-11-09 17:44:50 -05:00
Brad Payne (Vir Linden) 866ea1dc44 Fix for general graphical glitching on some cards 2012-10-29 18:05:50 -04:00
Nyx Linden 3ac3f76fc3 FIX: fixed broken baked texture rendering in lltexlayer, by enforcing correct gl state in lltexlayer.cpp
FIX: updated appearance utility source package
2012-10-19 21:49:26 +00:00
Nyx (Neal Orman) b9714ba85e Setting alpha rejection settings properly for texture bakes without basic shaders enabled 2012-10-18 15:00:05 -04:00
Don Kjer 19e43e4b58 Added fast timers for baked texture rendering. Updated appearance utility 2012-10-06 08:08:52 +00:00
Don Kjer 5483bc28ae Moved gatherMorphMaskAlpha into llappearance. 2012-10-02 01:02:34 +00:00
Don Kjer 0a94b5bb39 Exposing more tex layer information for hash id generation 2012-09-28 23:56:55 +00:00
Don Kjer f9a5cdba50 Started stubbing out llsd support for tex layer information. 2012-09-28 01:06:17 +00:00
Nyx (Neal Orman) f1d6052e36 SH-3264 Moved over a few more items to llappearance
moved over:
isWearingWearableType
wearable::writeToAvatar
wearable::mTEMap (stores LocalTextureObject*)
more from wearable::import/export
wearable::createVisualParams, etc
2012-09-11 11:59:45 -04:00
Don Kjer cf7eb79fa7 Removed most llappearance -> llui dependencies (LLTrans remains). Moved LLInventoryIcon::EIconName into LLInventoryType. Moved LLInventoryIcon back to newview. Moved LLUI gl_* functions into llrender. 2012-09-08 04:39:11 +00:00
Don Kjer 85d0bcc063 Extracted mWearableDatas from LLAgentWearables into llappearance/LLWearableData. Moved LLDriverParam into llappearance 2012-09-06 02:53:55 +00:00
Don Kjer 1f6e20c5bb Split gl-specific LLViewerTexture implementation into llrender/LLGLViewerTexture 2012-09-04 17:43:08 +00:00
Don Kjer 204be2ba52 Split LLTexLayerSetBuffer into llappearance portion, and viewer-specific LLViewerTexLayerSetBuffer 2012-09-04 15:18:15 +00:00
Don Kjer 21c364c4d4 Renamed LLVOAvatarDefines to LLAvatarAppearanceDefines 2012-09-03 09:10:24 +00:00
Don Kjer 0c7623f628 Cleanup of llappearance refactor file definition order for easier diff'ing 2012-09-03 08:37:58 +00:00
Don Kjer c355fb98d3 Extracted texture baking system into llappearance library. 2012-09-03 06:12:50 +00:00