From efcd347c80458f3b18284a1250bef7ef7ea5a325 Mon Sep 17 00:00:00 2001
From: Steven Bennetts <steve@lindenlab.com>
Date: Tue, 6 Mar 2007 01:01:51 +0000
Subject: [PATCH] merge -r 58734:58751 maintenance -> release
---
indra/newview/llselectmgr.cpp | 6 ++----
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 434d7a4492d..950ed61b253 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 1947459c6ad..5d803b4c52a 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;
}
--
GitLab