diff options
author | Jacek Antonelli | 2008-08-15 23:45:42 -0500 |
---|---|---|
committer | Jacek Antonelli | 2008-08-15 23:45:42 -0500 |
commit | ce28e056c20bf2723f565bbf464b87781ec248a2 (patch) | |
tree | ef7b0501c4de4b631a916305cbc2a5fdc125e52d /linden/indra/newview/llfloatermap.cpp | |
parent | Second Life viewer sources 1.19.1.4b (diff) | |
download | meta-impy-ce28e056c20bf2723f565bbf464b87781ec248a2.zip meta-impy-ce28e056c20bf2723f565bbf464b87781ec248a2.tar.gz meta-impy-ce28e056c20bf2723f565bbf464b87781ec248a2.tar.bz2 meta-impy-ce28e056c20bf2723f565bbf464b87781ec248a2.tar.xz |
Second Life viewer sources 1.20.2
Diffstat (limited to 'linden/indra/newview/llfloatermap.cpp')
-rw-r--r-- | linden/indra/newview/llfloatermap.cpp | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/linden/indra/newview/llfloatermap.cpp b/linden/indra/newview/llfloatermap.cpp index 232055a..36a9ab0 100644 --- a/linden/indra/newview/llfloatermap.cpp +++ b/linden/indra/newview/llfloatermap.cpp | |||
@@ -184,23 +184,20 @@ BOOL LLFloaterMap::canClose() | |||
184 | // virtual | 184 | // virtual |
185 | void LLFloaterMap::draw() | 185 | void LLFloaterMap::draw() |
186 | { | 186 | { |
187 | if( getVisible() ) | 187 | // Note: we can't just gAgent.check cameraMouselook() because the transition states are wrong. |
188 | if( gAgent.cameraMouselook()) | ||
188 | { | 189 | { |
189 | // Note: we can't just gAgent.check cameraMouselook() because the transition states are wrong. | 190 | setMouseOpaque(FALSE); |
190 | if( gAgent.cameraMouselook()) | 191 | getDragHandle()->setMouseOpaque(FALSE); |
191 | { | ||
192 | setMouseOpaque(FALSE); | ||
193 | getDragHandle()->setMouseOpaque(FALSE); | ||
194 | 192 | ||
195 | drawChild(mMap); | 193 | drawChild(mMap); |
196 | } | 194 | } |
197 | else | 195 | else |
198 | { | 196 | { |
199 | setMouseOpaque(TRUE); | 197 | setMouseOpaque(TRUE); |
200 | getDragHandle()->setMouseOpaque(TRUE); | 198 | getDragHandle()->setMouseOpaque(TRUE); |
201 | 199 | ||
202 | LLFloater::draw(); | 200 | LLFloater::draw(); |
203 | } | ||
204 | } | 201 | } |
205 | } | 202 | } |
206 | 203 | ||