livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge -r 58734:58751 maintenance -> release

master
Steven Bennetts 2007-03-06 01:01:51 +00:00
parent 14360b815e
commit efcd347c80
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
indra/newview/llselectmgr.cpp
View File

@ -1300,9 +1300,7 @@ void LLSelectMgr::selectionSetImage(const LLUUID& imageid)
LLViewerObject* objectp;
S32 te;
mSelectedObjects->getFirstTE(&objectp, &te);
for (objectp = mSelectedObjects->getFirstObject(); objectp; objectp = mSelectedObjects->getNextObject())
for (mSelectedObjects->getFirstTE(&objectp, &te); objectp; mSelectedObjects->getNextTE(&objectp, &te))
{
if (item)
{
@ -2867,7 +2865,7 @@ void LLSelectMgr::selectDelete()
}
else
{
confirmDelete(0, (void*)this);
confirmDelete(0, (void*)selection_handlep);
}
}

5
indra/newview/lltoolcomp.cpp
View File

@ -485,6 +485,11 @@ BOOL LLToolCompCreate::handleMouseUp(S32 x, S32 y, MASK mask)
mObjectPlacedOnMouseDown = FALSE;
mMouseDown = FALSE;
if (!handled)
{
handled = LLToolComposite::handleMouseUp(x, y, mask);
}
return handled;
}