----------------------------------------------------------- This is an automatically generated e-mail. To reply, visit: http://codereview.secondlife.com/r/162/#review404 -----------------------------------------------------------
indra/llprimitive/lltextureentry.cpp <http://codereview.secondlife.com/r/162/#comment284> Looks like you need to add creation/deletion of mMediaEntry if the TEM_MEDIA_MASK bit flipped. - Merov On Feb. 22, 2011, 11:12 a.m., Kitty Barnett wrote: > > ----------------------------------------------------------- > This is an automatically generated e-mail. To reply, visit: > http://codereview.secondlife.com/r/162/ > ----------------------------------------------------------- > > (Updated Feb. 22, 2011, 11:12 a.m.) > > > Review request for Viewer. > > > Summary > ------- > > S32 LLTextureEntry::setMediaTexGen(U8 media) would appear to be the root > cause of the bug: > > The header file suggests that: > > // The Media Tex Gen values are bits in a bit field: > // +----------+ > // | .....TTM | M = Media Flags (web page), T = LLTextureEntry::eTexGen, . = > unused > // | 76543210 | > // +----------+ > const S32 TEM_MEDIA_MASK = 0x01; > const S32 TEM_TEX_GEN_MASK = 0x06; > > and while LLTextureEntry::setTexGen() and LLTextureEntry::setMediaFlags() > each properly mask off the supplied parameter with their respective bit mask, > setMediaTexGen() will always return TEM_CHANGE_MEDIA even if only texgen has > changed while the media flag hasn't (causing > LLVOVolume::processUpdateMessage() to queue a request to the cap when it > shouldn't). > > Changing it to: > > S32 LLTextureEntry::setMediaTexGen(U8 media) > { > S32 result = setTexGen(media & TEM_TEX_GEN_MASK); > result |= setMediaFlags(media & TEM_MEDIA_MASK); > return result; > } > > appears to resolve the issue completely (the cap isn't hit unless an object > nearby has media on it, or changes its URL) > > > This addresses bug STORM-1001. > http://jira.secondlife.com/browse/STORM-1001 > > > Diffs > ----- > > indra/llprimitive/lltextureentry.cpp UNKNOWN > > Diff: http://codereview.secondlife.com/r/162/diff > > > Testing > ------- > > > Thanks, > > Kitty > >
_______________________________________________ Policies and (un)subscribe information available here: http://wiki.secondlife.com/wiki/OpenSource-Dev Please read the policies before posting to keep unmoderated posting privileges