aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llfloatermap.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'linden/indra/newview/llfloatermap.cpp')
-rw-r--r--linden/indra/newview/llfloatermap.cpp25
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
185void LLFloaterMap::draw() 185void 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