> On April 8, 2011, 12:53 p.m., Vadim ProductEngine wrote: > > > > Vadim ProductEngine wrote: > > I regenerated the viewer-development-storm-973 branch based on the > latest viewer-development branch. > > If you still can not apply the patch directly, I am afraid you should > do the manual merge. Otherwise grant me the permission, I will do it. > Manual merge with what? I just applied the patch to the revision it was > made for. There were no conflicting changes. > Let me elaborate... > The patch claims to have been generated on top of changeset 13670741a0a8, > which doesn't have the "if(gNoRender) return;" line in > LLViewerTextureList::decodeAllImages(), thus the patch fails to apply. > I'm pretty sure there's something wrong with the way the patch was > generated. > > BTW, viewer-development and viewer-development-storm-973 are absolutely > identical. What's the point of having an identical clone?
I was wrong. The patch was made for changeset 8395569a8f77, which is missing in both repositories. That must be the reason... - Vadim ----------------------------------------------------------- This is an automatically generated e-mail. To reply, visit: http://codereview.secondlife.com/r/252/#review575 ----------------------------------------------------------- On April 8, 2011, 10:26 a.m., Xiaohong Bao wrote: > > ----------------------------------------------------------- > This is an automatically generated e-mail. To reply, visit: > http://codereview.secondlife.com/r/252/ > ----------------------------------------------------------- > > (Updated April 8, 2011, 10:26 a.m.) > > > Review request for Viewer. > > > Summary > ------- > > this is to resubmit the patch for storm-973. > > We are not very clear what causes this. But this fix is targeting three most > possible causes: > 1, a texture is failed to add into mImageList but its flag is set to be > successful; > 2, a texture status is changed not from the main thread, because gTextureList > is not thread-safe; > 3, gTextureList is accessed before it is initialized. > > I regenerated the viewer-development-storm-973 branch based on the latest > viewer-development branch. If you still can not apply the patch directly, I > am afraid you should do the manual merge. Otherwise grant me the permission, > I will do it. > > > This addresses bug storm-973. > http://jira.secondlife.com/browse/storm-973 > > > Diffs > ----- > > indra/newview/lldrawpoolbump.cpp 13670741a0a8 > indra/newview/llviewertexturelist.h 13670741a0a8 > indra/newview/llviewertexturelist.cpp 13670741a0a8 > > Diff: http://codereview.secondlife.com/r/252/diff > > > Testing > ------- > > > Thanks, > > Xiaohong > >
_______________________________________________ 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
