Second Life viewer sources 1.19.1.0

1 files changed, 3 insertions, 29 deletions

diff --git a/linden/indra/newview/llfloaterworldmap.cpp b/linden/indra/newview/llfloaterworldmap.cpp
index 7a8940d..9ac3133 100644
--- a/linden/indra/newview/llfloaterworldmap.cpp
+++ b/linden/indra/newview/llfloaterworldmap.cpp
@@ -39,13 +39,6 @@
 
 #include "llfloaterworldmap.h"
 
-// Library includes
-#include "llfontgl.h"
-#include "llinventory.h"
-#include "lllineeditor.h"
-#include "message.h"
-
-// Viewer includes
 #include "llagent.h"
 #include "llviewerwindow.h"
 #include "llbutton.h"
@@ -54,36 +47,23 @@
 #include "llcombobox.h"
 #include "llviewercontrol.h"
 #include "lldraghandle.h"
-#include "lleconomy.h"
 #include "llfirstuse.h"
 #include "llfocusmgr.h"
-#include "lliconctrl.h"
 #include "llinventorymodel.h"
-#include "llinventoryview.h"
 #include "lllandmarklist.h"
+#include "lllineeditor.h"
 #include "llnetmap.h"
 #include "llpreviewlandmark.h"
-#include "llradiogroup.h"
 #include "llregionhandle.h"
-#include "llresizehandle.h"
-#include "llresmgr.h"
 #include "llscrolllistctrl.h"
-#include "llsliderctrl.h"
-#include "llspinctrl.h"
-#include "llstatusbar.h"
-#include "lltabcontainer.h"
 #include "lltextbox.h"
 #include "lltracker.h"
-#include "llui.h"
-#include "lluiconstants.h"
 #include "llurldispatcher.h"
-#include "llviewercamera.h"
 #include "llviewermenu.h"
 #include "llviewerregion.h"
 #include "llviewerstats.h"
 #include "llworldmap.h"
 #include "llworldmapview.h"
-#include "llurl.h"
 #include "llvieweruictrlfactory.h"
 #include "llappviewer.h"
 #include "llmapimagetype.h"
@@ -170,13 +150,7 @@ const LLUUID LLFloaterWorldMap::sHomeID( "10000000-0000-0000-0000-000000000001"
 
 
 LLFloaterWorldMap::LLFloaterWorldMap()
-:       LLFloater("worldmap", "FloaterWorldMapRect", "World Map",
-                          TRUE,         // resize
-                          410,          // min-width
-                          520,          // min-height
-                          FALSE,        // drag on left
-                          TRUE,         // minimize
-                          TRUE),        // close
+:       LLFloater("worldmap"),
         mInventory(NULL),
         mInventoryObserver(NULL),
         mFriendObserver(NULL),
@@ -518,7 +492,7 @@ void LLFloaterWorldMap::draw()
         childSetEnabled("copy_slurl", (mSLURL.size() > 0) );
 
         setMouseOpaque(TRUE);
-        mDragHandle->setMouseOpaque(TRUE);
+        getDragHandle()->setMouseOpaque(TRUE);
 
         //RN: snaps to zoom value because interpolation caused jitter in the text rendering
         if (!mZoomTimer.getStarted() && mCurZoomVal != (F32)childGetValue("zoom slider").asReal())