SH-1719 FIXED Viewer side cleanup of presentation of accounting data in build tools

- Moved grid mode combo box to the grid options floater

- Updated UI of the build floater according to the spec

- Fixed "conflict" between LLFloaterOpenHandler and LLFloaterHandler command handlers

1 files changed, 21 insertions, 2 deletions

diff --git a/indra/newview/llfloaterbuildoptions.h b/indra/newview/llfloaterbuildoptions.h
index 164944d7bc..7f3811bf1c 100644
--- a/indra/newview/llfloaterbuildoptions.h
+++ b/indra/newview/llfloaterbuildoptions.h
@@ -33,15 +33,34 @@
 #define LL_LLFLOATERBUILDOPTIONS_H
 
 #include "llfloater.h"
+#include "llselectmgr.h"
 
+class LLComboBox;
+class LLObjectSelection;
+
+typedef LLSafeHandle<LLObjectSelection> LLObjectSelectionHandle;
 
 class LLFloaterBuildOptions
 	:	public LLFloater
 {
-	friend class LLFloaterReg;
+public:
+
+	virtual BOOL postBuild();
+
+	/*virtual*/ void onOpen(const LLSD& key);
+	/*virtual*/	void onClose(bool app_quitting);
+
+	void setGridMode(EGridMode mode);
+	void updateGridMode();
+
 private:
+
+	friend class LLFloaterReg;
+
 	LLFloaterBuildOptions(const LLSD& key);
 	~LLFloaterBuildOptions();
-};
 
+	LLComboBox*	mComboGridMode;
+	LLObjectSelectionHandle	mObjectSelection;
+};
 #endif