summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMnikolenko ProductEngine <mnikolenko@productengine.com>2014-12-12 12:09:17 +0200
committerMnikolenko ProductEngine <mnikolenko@productengine.com>2014-12-12 12:09:17 +0200
commitc2bd14193d0c4dff636f2703ed90cc3d4a23edee (patch)
tree4477af0e47861369d2991d40d843600df682f31c
parent45167dba2efb1ebb88bba923f7fe16e698c20a5a (diff)
MAINT-4739 FIXED Restore cursor when WorldMap floater loses focus.
-rwxr-xr-xindra/newview/llfloaterworldmap.cpp8
-rwxr-xr-xindra/newview/llfloaterworldmap.h2
2 files changed, 10 insertions, 0 deletions
diff --git a/indra/newview/llfloaterworldmap.cpp b/indra/newview/llfloaterworldmap.cpp
index ff66bdedb0..5093a40ce4 100755
--- a/indra/newview/llfloaterworldmap.cpp
+++ b/indra/newview/llfloaterworldmap.cpp
@@ -63,6 +63,7 @@
#include "llviewerregion.h"
#include "llviewerstats.h"
#include "llviewertexture.h"
+#include "llviewerwindow.h"
#include "llworldmap.h"
#include "llworldmapmessage.h"
#include "llworldmapview.h"
@@ -1634,3 +1635,10 @@ void LLFloaterWorldMap::onChangeMaturity()
gSavedSettings.setBOOL("ShowAdultEvents", FALSE);
}
}
+
+void LLFloaterWorldMap::onFocusLost()
+{
+ gViewerWindow->showCursor();
+ LLWorldMapView* map_panel = (LLWorldMapView*)gFloaterWorldMap->mPanel;
+ map_panel->mPanning = FALSE;
+}
diff --git a/indra/newview/llfloaterworldmap.h b/indra/newview/llfloaterworldmap.h
index 84ca5a7a71..7ce8dae9a9 100755
--- a/indra/newview/llfloaterworldmap.h
+++ b/indra/newview/llfloaterworldmap.h
@@ -68,6 +68,8 @@ public:
/*virtual*/ BOOL handleScrollWheel(S32 x, S32 y, S32 clicks);
/*virtual*/ void draw();
+ /*virtual*/ void onFocusLost();
+
// methods for dealing with inventory. The observe() method is
// called during program startup. inventoryUpdated() will be
// called by a helper object when an interesting change has