Rearranging and cleaning up some assorted code

indra/newview/llappviewer.cpp

@@ -461,6 +461,7 @@ static void settings_to_globals()
 	BTN_HEIGHT_SMALL	= gSavedSettings.getS32("ButtonHeightSmall");
 	BTN_HEIGHT			= gSavedSettings.getS32("ButtonHeight");
 
+	extern S32 MENU_BAR_HEIGHT;
 	MENU_BAR_HEIGHT		= gSavedSettings.getS32("MenuBarHeight");
 	extern S32 STATUS_BAR_HEIGHT;
 	STATUS_BAR_HEIGHT	= gSavedSettings.getS32("StatusBarHeight");

indra/newview/llfloatermarketplacelistings.h

@@ -217,6 +217,8 @@ private:
 	LLTextEditor*	mEditor;
 };
 
+
+#if 0
 //-----------------------------------------------------------------------------
 // LLFloaterItemProperties
 //-----------------------------------------------------------------------------
@@ -232,5 +234,6 @@ public:
 
 private:
 };
+#endif
 
 #endif // LL_LLFLOATERMARKETPLACELISTINGS_H

indra/newview/llpreviewnotecard.cpp

@@ -45,6 +45,7 @@
 #include "llfloatersearchreplace.h"
 #include "llinventorymodel.h"
 #include "lllineeditor.h"
+#include "llmenugl.h"
 #include "llnotificationsutil.h"
 #include "llresmgr.h"
 #include "roles_constants.h"