diff options
author | Jacek Antonelli | 2008-08-15 23:44:50 -0500 |
---|---|---|
committer | Jacek Antonelli | 2008-08-15 23:44:50 -0500 |
commit | 89fe5dab825a62a0e3fd8d248cbc91c65eb2a426 (patch) | |
tree | bcff14b7888d04a2fec799c59369f6095224bd08 /linden/indra/newview/lltoolface.cpp | |
parent | Second Life viewer sources 1.13.3.2 (diff) | |
download | meta-impy-89fe5dab825a62a0e3fd8d248cbc91c65eb2a426.zip meta-impy-89fe5dab825a62a0e3fd8d248cbc91c65eb2a426.tar.gz meta-impy-89fe5dab825a62a0e3fd8d248cbc91c65eb2a426.tar.bz2 meta-impy-89fe5dab825a62a0e3fd8d248cbc91c65eb2a426.tar.xz |
Second Life viewer sources 1.14.0.0
Diffstat (limited to '')
-rw-r--r-- | linden/indra/newview/lltoolface.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/linden/indra/newview/lltoolface.cpp b/linden/indra/newview/lltoolface.cpp index 504a787..b855e0f 100644 --- a/linden/indra/newview/lltoolface.cpp +++ b/linden/indra/newview/lltoolface.cpp | |||
@@ -61,7 +61,7 @@ LLToolFace::~LLToolFace() | |||
61 | 61 | ||
62 | BOOL LLToolFace::handleDoubleClick(S32 x, S32 y, MASK mask) | 62 | BOOL LLToolFace::handleDoubleClick(S32 x, S32 y, MASK mask) |
63 | { | 63 | { |
64 | if (!gSelectMgr->isEmpty()) | 64 | if (!gSelectMgr->getSelection()->isEmpty()) |
65 | { | 65 | { |
66 | // You should already have an object selected from the mousedown. | 66 | // You should already have an object selected from the mousedown. |
67 | // If so, show its properties | 67 | // If so, show its properties |
@@ -109,7 +109,7 @@ void LLToolFace::pickCallback(S32 x, S32 y, MASK mask) | |||
109 | // object wasn't selected so add the object and face | 109 | // object wasn't selected so add the object and face |
110 | gSelectMgr->selectObjectOnly(hit_obj, hit_face); | 110 | gSelectMgr->selectObjectOnly(hit_obj, hit_face); |
111 | } | 111 | } |
112 | else if (!gSelectMgr->contains(hit_obj, hit_face) ) | 112 | else if (!gSelectMgr->getSelection()->contains(hit_obj, hit_face) ) |
113 | { | 113 | { |
114 | // object is selected, but not this face, so add it. | 114 | // object is selected, but not this face, so add it. |
115 | gSelectMgr->addAsIndividual(hit_obj, hit_face); | 115 | gSelectMgr->addAsIndividual(hit_obj, hit_face); |