diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2007-03-06 01:01:51 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2007-03-06 01:01:51 +0000 |
| commit | efcd347c80458f3b18284a1250bef7ef7ea5a325 (patch) | |
| tree | 1f2a9700d2677b713bc58816e2e880ee0416bf4b /indra | |
| parent | 14360b815ed486c90c57b8025f8c93376ca6b6c6 (diff) | |
merge -r 58734:58751 maintenance -> release
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llselectmgr.cpp | 6 | ||||
| -rw-r--r-- | indra/newview/lltoolcomp.cpp | 5 |
2 files changed, 7 insertions, 4 deletions
diff --git a/indra/newview/llselectmgr.cpp b/indra/newview/llselectmgr.cpp index 434d7a4492..950ed61b25 100644 --- a/indra/newview/llselectmgr.cpp +++ b/indra/newview/llselectmgr.cpp @@ -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); } } diff --git a/indra/newview/lltoolcomp.cpp b/indra/newview/lltoolcomp.cpp index 1947459c6a..5d803b4c52 100644 --- a/indra/newview/lltoolcomp.cpp +++ b/indra/newview/lltoolcomp.cpp @@ -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; } |