4 files changed, 308 insertions, 73 deletions

diff --git a/linden/indra/newview/app_settings/settings_per_account.xml b/linden/indra/newview/app_settings/settings_per_account.xml
index 83852d3..7465af2 100644
--- a/linden/indra/newview/app_settings/settings_per_account.xml
+++ b/linden/indra/newview/app_settings/settings_per_account.xml
@@ -231,7 +231,6 @@
 
       <!-- Begin build -->
 
-
       <key>BuildPrefs_Xsize</key>
       <map>
         <key>Comment</key>
diff --git a/linden/indra/newview/llfloaterbuildoptions.cpp b/linden/indra/newview/llfloaterbuildoptions.cpp
index 6c59a4e..372b1df 100644
--- a/linden/indra/newview/llfloaterbuildoptions.cpp
+++ b/linden/indra/newview/llfloaterbuildoptions.cpp
@@ -4,7 +4,8 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2009, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc., 
+ * 2010, McCabe Maxsted
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -38,7 +39,6 @@
 #include "llviewerprecompiledheaders.h"
 
 #include "llfloaterbuildoptions.h"
-#include "lluictrlfactory.h"
 
 // library includes
 #include "llfontgl.h"
@@ -47,8 +47,10 @@
 #include "llspinctrl.h"
 #include "llsliderctrl.h"
 #include "lltexturectrl.h"
+#include "lluictrlfactory.h"
 
 // newview includes
+#include "llcolorswatch.h"
 #include "llinventorymodel.h"
 #include "llresmgr.h"
 #include "llstartup.h" // not really necessary here, but just in case
@@ -60,13 +62,15 @@
 // Globals
 //
 LLFloaterBuildOptions   *LLFloaterBuildOptions::sInstance = NULL;
-InvDropTarget * LLFloaterBuildOptions::mBuildObjectDropTarget;
+InvDropTarget * LLFloaterBuildOptions::sBuildObjectDropTarget;
 
 //
 // Methods
 //
-LLFloaterBuildOptions::LLFloaterBuildOptions( )
-: LLFloater(std::string("build options floater"))
+LLFloaterBuildOptions::LLFloaterBuildOptions()
+: LLFloater(std::string("build options floater")),
+mBuildItemUUID(NULL),
+mBuildTextureUUID(NULL)
 {
         sInstance = this;
 }
@@ -74,53 +78,72 @@ LLFloaterBuildOptions::LLFloaterBuildOptions( )
 LLFloaterBuildOptions::~LLFloaterBuildOptions()
 {
         sInstance = NULL;
-        delete mBuildObjectDropTarget;
-        mBuildObjectDropTarget = NULL;
+        delete sBuildObjectDropTarget;
+        sBuildObjectDropTarget = NULL;
 }
 
 BOOL LLFloaterBuildOptions::postBuild()
 {
+        childSetAction("btn_ok", onClickOK, this);
+        childSetAction("btn_apply", onClickApply, this);
+        childSetAction("btn_cancel", onClickCancel, this);
+        childSetAction("btn_clear", onClickClear, this);
+        childSetAction("btn_reset", onClickReset, this);
+
         getChild<LLComboBox>("material")->setSimple(gSavedPerAccountSettings.getString("BuildPrefs_Material"));
         getChild<LLComboBox>("combobox shininess")->setSimple(gSavedPerAccountSettings.getString("BuildPrefs_Shiny"));
 
+        childSetValue("BuildPrefsActualRoot_toggle", gSavedPerAccountSettings.getBOOL("BuildPrefs_ActualRoot") );
+        childSetValue("PivotPercToggle", gSavedPerAccountSettings.getBOOL("BuildPrefs_PivotIsPercent") );
+        childSetValue("FBToggle", gSavedPerAccountSettings.getBOOL("BuildPrefs_FullBright") );
+        childSetValue("BuildPrefsEmbedItem", gSavedPerAccountSettings.getBOOL("BuildPrefs_EmbedItem") );
+        childSetValue("PhysicalToggle", gSavedPerAccountSettings.getBOOL("BuildPrefs_Physical") );
+        childSetValue("TemporaryToggle", gSavedPerAccountSettings.getBOOL("BuildPrefs_Temporary") );
+        childSetValue("PhantomToggle", gSavedPerAccountSettings.getBOOL("BuildPrefs_Phantom") );
+
+        childSetValue("Z pos", gSavedPerAccountSettings.getF32("BuildPrefs_PivotZ") );
+        childSetValue("Y pos", gSavedPerAccountSettings.getF32("BuildPrefs_PivotY") );
+        childSetValue("X pos", gSavedPerAccountSettings.getF32("BuildPrefs_PivotX") );
+        childSetValue("glow", gSavedPerAccountSettings.getF32("BuildPrefs_Glow") );
+        childSetValue("alpha", gSavedPerAccountSettings.getF32("BuildPrefs_Alpha") );
+        childSetValue("Z size", gSavedPerAccountSettings.getF32("BuildPrefs_Zsize") );
+        childSetValue("Y size", gSavedPerAccountSettings.getF32("BuildPrefs_Ysize") );
+        childSetValue("X size", gSavedPerAccountSettings.getF32("BuildPrefs_Xsize") );
+
+        getChild<LLColorSwatchCtrl>("colorswatch")->set(gSavedPerAccountSettings.getColor4("BuildPrefs_Color"), TRUE );
+        getChild<LLTextureCtrl>("texture control")->setImageAssetID(LLUUID(gSavedPerAccountSettings.getString("BuildPrefs_Texture")));
+
+        childSetValue("BuildPrefsRenderHighlight_toggle", gSavedSettings.getBOOL("RenderHighlightSelections") );
+        childSetValue("grouplandrez", gSavedSettings.getBOOL("RezWithLandGroup") );
+        childSetValue("GridSubUnit", gSavedSettings.getBOOL("GridSubUnit") );
+        childSetValue("GridCrossSection", gSavedSettings.getBOOL("GridCrossSections") );
+
+        childSetValue("GridResolution", gSavedSettings.getF32("GridResolution") );
+        childSetValue("GridDrawSize", gSavedSettings.getF32("GridDrawSize") );
+        childSetValue("GridOpacity", gSavedSettings.getF32("GridOpacity") );
+
         getChild<LLComboBox>("material")->setCommitCallback(onComboBoxCommit);
         getChild<LLComboBox>("combobox shininess")->setCommitCallback(onComboBoxCommit);
 
         getChild<LLTextureCtrl>("texture control")->setDefaultImageAssetID(LLUUID("89556747-24cb-43ed-920b-47caed15465f"));
         getChild<LLTextureCtrl>("texture control")->setCommitCallback(onTexturePickerCommit);
+        getChild<LLTextureCtrl>("texture control")->setCallbackUserData(this);
 
         LLView *target_view = getChild<LLView>("build_item_add_disp_rect");
         if (target_view)
         {
-                if (mBuildObjectDropTarget) 
+                if (sBuildObjectDropTarget) 
                 {
-                        delete mBuildObjectDropTarget;
+                        delete sBuildObjectDropTarget;
                 }
-                mBuildObjectDropTarget = new InvDropTarget("build drop target", target_view->getRect(),BuildAutoResponseItemDrop);
-                addChild(mBuildObjectDropTarget);
+                sBuildObjectDropTarget = new InvDropTarget("build drop target", target_view->getRect(),BuildAutoResponseItemDrop);
+                addChild(sBuildObjectDropTarget);
         }
 
-        if (LLStartUp::getStartupState() == STATE_STARTED)
-        {
-                LLUUID itemid = (LLUUID)gSavedPerAccountSettings.getString("BuildPrefs_Item");
-                LLViewerInventoryItem* item = gInventory.getItem(itemid);
-                if (item)
-                {
-                        childSetValue("build_item_add_disp_rect_txt", "Currently set to: "+item->getName());
-                }
-                else if (itemid.isNull())
-                {
-                        childSetValue("build_item_add_disp_rect_txt", "Currently not set");
-                }
-                else
-                {
-                        childSetValue("build_item_add_disp_rect_txt", "Currently set to a item not on this account");
-                }
-        }
-        else
-        {
-                childSetValue("build_item_add_disp_rect_txt", "Not logged in");
-        }
+        mBuildItemUUID = (LLUUID)gSavedPerAccountSettings.getString("BuildPrefs_Item");
+        mBuildTextureUUID = (LLUUID)gSavedPerAccountSettings.getString("BuildPrefs_Texture");
+
+        refreshItem(); // Refresh the item UI bits after everything's loaded -- MC
 
         return TRUE;
 }
@@ -152,27 +175,207 @@ BOOL LLFloaterBuildOptions::visible(void*)
         return (sInstance != NULL);
 }
 
+// static
 void LLFloaterBuildOptions::BuildAutoResponseItemDrop(LLViewerInventoryItem* item)
 {
-        gSavedPerAccountSettings.setString("BuildPrefs_Item", item->getUUID().asString());
-        LLFloaterBuildOptions::getInstance()->childSetValue("build_item_add_disp_rect_txt", "Currently set to: "+item->getName());
+        LLFloaterBuildOptions::getInstance()->setItem(item->getUUID());
+        LLFloaterBuildOptions::getInstance()->refreshItem();
+        /*LLFloaterBuildOptions::getInstance()->childSetValue("build_item_add_disp_rect_txt", "Currently set to: "+item->getName());
+        gSavedPerAccountSettings.setString("BuildPrefs_Item", item->getUUID().asString());*/
 }
 
+// static
 void LLFloaterBuildOptions::onComboBoxCommit(LLUICtrl* ctrl, void* userdata)
 {
-        
         LLComboBox* box = (LLComboBox*)ctrl;
         if(box)
         {
-                gSavedSettings.setString(box->getControlName(), box->getValue().asString());
-        }       
+                gSavedPerAccountSettings.setString(box->getControlName(), box->getValue().asString());
+        }
 }
 
+// static
 void LLFloaterBuildOptions::onTexturePickerCommit(LLUICtrl* ctrl, void* userdata)
 {
+        LLFloaterBuildOptions* self = (LLFloaterBuildOptions*)userdata;
+
         LLTextureCtrl*  image_ctrl = (LLTextureCtrl*)ctrl;
         if(image_ctrl)
         {
-                gSavedPerAccountSettings.setString("BuildPrefs_Texture", image_ctrl->getImageAssetID().asString());
+                self->setTexture(image_ctrl->getImageAssetID());
+                /*gSavedPerAccountSettings.setString("BuildPrefs_Texture", image_ctrl->getImageAssetID().asString());*/
+        }
+}
+
+// static
+void LLFloaterBuildOptions::onClickOK(void* userdata)
+{
+        LLFloaterBuildOptions* self = (LLFloaterBuildOptions*)userdata;
+        self->apply();
+        self->close();
+}
+
+// static
+void LLFloaterBuildOptions::onClickApply(void* userdata)
+{
+        LLFloaterBuildOptions* self = (LLFloaterBuildOptions*)userdata;
+        self->apply();
+}
+
+// static
+void LLFloaterBuildOptions::onClickCancel(void* userdata)
+{
+        LLFloaterBuildOptions* self = (LLFloaterBuildOptions*)userdata;
+        self->cancel();
+}
+
+// static
+void LLFloaterBuildOptions::onClickClear(void* userdata)
+{
+        // Clear the inventory item
+        LLFloaterBuildOptions* self = (LLFloaterBuildOptions*)userdata;
+        //gSavedPerAccountSettings.setString("BuildPrefs_Item", LLUUID::null);
+        //gSavedPerAccountSettings.getControl("BuildPrefs_Item")->resetToDefault(false);
+
+        self->setItem(LLUUID::null);
+        self->refreshItem();
+}
+
+// static
+void LLFloaterBuildOptions::onClickReset(void* userdata)
+{
+        // Reset to defaults
+        LLFloaterBuildOptions* self = (LLFloaterBuildOptions*)userdata;
+        self->reset();
+        self->refresh();
+}
+
+void LLFloaterBuildOptions::apply()
+{
+        gSavedPerAccountSettings.setBOOL("BuildPrefs_ActualRoot", childGetValue("BuildPrefsActualRoot_toggle").asBoolean() );
+        gSavedPerAccountSettings.setBOOL("BuildPrefs_PivotIsPercent", childGetValue("PivotPercToggle").asBoolean() );
+        gSavedPerAccountSettings.setBOOL("BuildPrefs_FullBright", childGetValue("FBToggle").asBoolean() );
+        gSavedPerAccountSettings.setBOOL("BuildPrefs_EmbedItem", childGetValue("BuildPrefsEmbedItem").asBoolean() );
+        gSavedPerAccountSettings.setBOOL("BuildPrefs_Physical", childGetValue("PhysicalToggle").asBoolean() );
+        gSavedPerAccountSettings.setBOOL("BuildPrefs_Temporary", childGetValue("TemporaryToggle").asBoolean() );
+        gSavedPerAccountSettings.setBOOL("BuildPrefs_Phantom", childGetValue("PhantomToggle").asBoolean() );
+
+        gSavedPerAccountSettings.setF32("BuildPrefs_PivotZ", childGetValue("Z pos").asReal() );
+        gSavedPerAccountSettings.setF32("BuildPrefs_PivotY", childGetValue("Y pos").asReal() );
+        gSavedPerAccountSettings.setF32("BuildPrefs_PivotX", childGetValue("X pos").asReal() );
+        gSavedPerAccountSettings.setF32("BuildPrefs_Glow", childGetValue("glow").asReal() );
+        gSavedPerAccountSettings.setF32("BuildPrefs_Alpha", childGetValue("alpha").asReal() );
+        gSavedPerAccountSettings.setF32("BuildPrefs_Zsize", childGetValue("Z size").asReal() );
+        gSavedPerAccountSettings.setF32("BuildPrefs_Ysize", childGetValue("Y size").asReal() );
+        gSavedPerAccountSettings.setF32("BuildPrefs_Xsize", childGetValue("X size").asReal() );
+
+        gSavedPerAccountSettings.setString("BuildPrefs_Shiny", getChild<LLComboBox>("combobox shininess")->getValue().asString() );
+        gSavedPerAccountSettings.setString("BuildPrefs_Material", getChild<LLComboBox>("material")->getValue().asString() );
+
+        gSavedPerAccountSettings.setColor4("BuildPrefs_Color", getChild<LLColorSwatchCtrl>("colorswatch")->get());
+
+        if (mBuildItemUUID != LLSD(gSavedPerAccountSettings.getString("BuildPrefs_Item")) )
+        {
+                gSavedPerAccountSettings.setString("BuildPrefs_Item", mBuildItemUUID.asString() );
+        }
+
+        if (mBuildTextureUUID != LLSD(gSavedPerAccountSettings.getString("BuildPrefs_Texture")) )
+        {
+                gSavedPerAccountSettings.setString("BuildPrefs_Texture", mBuildTextureUUID.asString() );
+        }
+
+        gSavedSettings.setBOOL("RenderHighlightSelections", childGetValue("BuildPrefsRenderHighlight_toggle").asBoolean() );
+        gSavedSettings.setBOOL("RezWithLandGroup", childGetValue("grouplandrez").asBoolean() );
+        gSavedSettings.setBOOL("GridSubUnit", childGetValue("GridSubUnit").asBoolean() );
+        gSavedSettings.setBOOL("GridCrossSections", childGetValue("GridCrossSection").asBoolean() );
+
+        gSavedSettings.setF32("GridResolution", childGetValue("GridResolution").asReal() );
+        gSavedSettings.setF32("GridDrawSize", childGetValue("GridDrawSize").asReal() );
+        gSavedSettings.setF32("GridOpacity", childGetValue("GridOpacity").asReal() );
+}
+
+void LLFloaterBuildOptions::cancel()
+{
+        close();
+}
+
+void LLFloaterBuildOptions::reset()
+{
+        getChild<LLComboBox>("material")->setSimple(gSavedPerAccountSettings.getControl("BuildPrefs_Material")->getDefault().asString() );
+        getChild<LLComboBox>("combobox shininess")->setSimple(gSavedPerAccountSettings.getControl("BuildPrefs_Shiny")->getDefault().asString() );
+
+        childSetValue("BuildPrefsActualRoot_toggle", gSavedPerAccountSettings.getControl("BuildPrefs_ActualRoot")->getDefault() );
+        childSetValue("PivotPercToggle", gSavedPerAccountSettings.getControl("BuildPrefs_PivotIsPercent")->getDefault() );
+        childSetValue("FBToggle", gSavedPerAccountSettings.getControl("BuildPrefs_FullBright")->getDefault() );
+        childSetValue("BuildPrefsEmbedItem", gSavedPerAccountSettings.getControl("BuildPrefs_EmbedItem")->getDefault() );
+        childSetValue("PhysicalToggle", gSavedPerAccountSettings.getControl("BuildPrefs_Physical")->getDefault() );
+        childSetValue("TemporaryToggle", gSavedPerAccountSettings.getControl("BuildPrefs_Temporary")->getDefault() );
+        childSetValue("PhantomToggle", gSavedPerAccountSettings.getControl("BuildPrefs_Phantom")->getDefault() );
+        
+        childSetValue("Z pos", gSavedPerAccountSettings.getControl("BuildPrefs_PivotZ")->getDefault() );
+        childSetValue("Y pos", gSavedPerAccountSettings.getControl("BuildPrefs_PivotY")->getDefault() );
+        childSetValue("X pos", gSavedPerAccountSettings.getControl("BuildPrefs_PivotX")->getDefault() );
+        childSetValue("glow", gSavedPerAccountSettings.getControl("BuildPrefs_Glow")->getDefault() );
+        childSetValue("alpha", gSavedPerAccountSettings.getControl("BuildPrefs_Alpha")->getDefault() );
+        childSetValue("Z size", gSavedPerAccountSettings.getControl("BuildPrefs_Zsize")->getDefault() );
+        childSetValue("Y size", gSavedPerAccountSettings.getControl("BuildPrefs_Ysize")->getDefault() );
+        childSetValue("X size", gSavedPerAccountSettings.getControl("BuildPrefs_Xsize")->getDefault() );
+
+        getChild<LLColorSwatchCtrl>("colorswatch")->set(gSavedPerAccountSettings.getControl("BuildPrefs_Color")->getDefault(), TRUE);
+        getChild<LLTextureCtrl>("texture control")->setImageAssetID(LLUUID(gSavedPerAccountSettings.getControl("BuildPrefs_Texture")->getDefault()) );
+
+        mBuildItemUUID = (LLUUID)gSavedPerAccountSettings.getControl("BuildPrefs_Item")->getDefault();
+        mBuildTextureUUID = (LLUUID)gSavedPerAccountSettings.getControl("BuildPrefs_Texture")->getDefault();
+
+        childSetValue("BuildPrefsRenderHighlight_toggle", gSavedSettings.getControl("RenderHighlightSelections")->getDefault() );
+        childSetValue("grouplandrez", gSavedSettings.getControl("RezWithLandGroup")->getDefault() );
+        childSetValue("GridSubUnit", gSavedSettings.getControl("GridSubUnit")->getDefault() );
+        childSetValue("GridCrossSection", gSavedSettings.getControl("GridCrossSections")->getDefault() );
+
+        childSetValue("GridResolution", gSavedSettings.getControl("GridResolution")->getDefault() );
+        childSetValue("GridDrawSize", gSavedSettings.getControl("GridDrawSize")->getDefault() );
+        childSetValue("GridOpacity", gSavedSettings.getControl("GridOpacity")->getDefault() );
+}
+
+void LLFloaterBuildOptions::refresh()
+{
+        
+}
+
+void LLFloaterBuildOptions::setItem(const LLUUID& item)
+{
+        mBuildItemUUID = item;
+}
+
+void LLFloaterBuildOptions::setTexture(const LLUUID& texture)
+{
+        mBuildTextureUUID = texture;
+}
+
+void LLFloaterBuildOptions::refreshItem()
+{
+        if (LLStartUp::getStartupState() == STATE_STARTED)
+        {
+                if (mBuildItemUUID.isNull())
+                {
+                        childSetValue("build_item_add_disp_rect_txt", "Currently not set");
+                }
+                else
+                {
+                        LLViewerInventoryItem* item = gInventory.getItem(mBuildItemUUID);
+                        if (item)
+                        {
+                                childSetValue("build_item_add_disp_rect_txt", "Currently set to: "+item->getName());
+                        }
+                        
+                        else
+                        {
+                                childSetValue("build_item_add_disp_rect_txt", "Currently set to a item not on this account");
+                        }
+                }
+        }
+        else
+        {
+                childSetValue("build_item_add_disp_rect_txt", "Not logged in");
         }
 }
diff --git a/linden/indra/newview/llfloaterbuildoptions.h b/linden/indra/newview/llfloaterbuildoptions.h
index 50599dd..c776055 100644
--- a/linden/indra/newview/llfloaterbuildoptions.h
+++ b/linden/indra/newview/llfloaterbuildoptions.h
@@ -5,6 +5,7 @@
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
  * Copyright (c) 2002-2009, Linden Research, Inc.
+ * 2010, McCabe Maxsted
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -40,8 +41,8 @@
 
 #include "llfloater.h"
 
-class LLViewerInventoryItem;
 class InvDropTarget;
+class LLViewerInventoryItem;
 
 class LLFloaterBuildOptions
 :       public LLFloater
@@ -57,15 +58,33 @@ public:
         static LLFloaterBuildOptions* getInstance();
         static BOOL             visible(void*);
 
+        void apply();
+        void cancel();
+        void refresh();
+        void reset();
+
+        void setItem(const LLUUID& item);
+        void setTexture(const LLUUID& texture);
+
 protected:
         static LLFloaterBuildOptions*   sInstance;
 
 private:
-        static InvDropTarget* mBuildObjectDropTarget;
+        static InvDropTarget*   sBuildObjectDropTarget;
+        LLUUID                                  mBuildItemUUID;
+        LLUUID                                  mBuildTextureUUID;
 
         static void onTexturePickerCommit(LLUICtrl* ctrl, void* userdata);
         static void onComboBoxCommit(LLUICtrl* ctrl, void* userdata);
         static void BuildAutoResponseItemDrop(LLViewerInventoryItem* item);
+
+        static void onClickOK(void* userdata);
+        static void onClickApply(void* userdata);
+        static void onClickCancel(void* userdata);
+        static void onClickClear(void* userdata);
+        static void onClickReset(void* userdata);
+        
+        void refreshItem();
 };
 
 #endif
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_build_options.xml b/linden/indra/newview/skins/default/xui/en-us/floater_build_options.xml
index cdd5dc1..298805d 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_build_options.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_build_options.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater bottom="-297" can_close="true" can_drag_on_left="false" can_minimize="true"
-     can_resize="false" follows="right" height="355" min_height="355"
+     can_resize="false" follows="right" height="370" min_height="370"
      min_width="530" mouse_opaque="true" name="build options floater"
      rect_control="FloaterBuildOptionsRect" title="Advanced Build Options" width="530">
 
@@ -10,23 +10,23 @@
        bottom_delta="110" drop_shadow_visible="true" enabled="true" follows="left|top" font="SansSerifSmall"
        h_pad="0" halign="left" height="10" left_delta="53" mouse_opaque="false"
        name="text_box7" v_pad="0" width="150">        Grid Options</text>
-  <spinner bottom="-60" control_name="GridResolution" decimal_digits="3"
+  <spinner bottom="-60" decimal_digits="3"
              follows="left|top" height="16" increment="0.1" initial_val="1"
              label="Grid Units (m)" label_width="90" left="21" max_val="5"
              min_val="0.01" mouse_opaque="true" name="GridResolution" width="155" />
-        <spinner bottom_delta="-20" control_name="GridDrawSize" decimal_digits="1"
+        <spinner bottom_delta="-20" decimal_digits="1"
              follows="left|top" height="16" increment="0.5" initial_val="5"
              label="Grid Extents (m)" label_width="90" left_delta="0" max_val="50"
-     min_val="1" mouse_opaque="true" name="GridDrawSize" width="155" />
-  <check_box bottom_delta="-20" control_name="GridSubUnit" follows="left|top"
+       min_val="1" mouse_opaque="true" name="GridDrawSize" width="155" />
+  <check_box bottom_delta="-20" follows="left|top"
              font="SansSerifSmall" height="16" initial_value="false"
              label="Sub-Unit Snapping" left_delta="0" mouse_opaque="true"
              name="GridSubUnit" width="200" />
-  <check_box bottom_delta="-20" control_name="GridCrossSections" follows="left|top"
+  <check_box bottom_delta="-20" follows="left|top"
              font="SansSerifSmall" height="16" initial_value="false"
              label="Show Cross Sections" left_delta="0" mouse_opaque="true"
              name="GridCrossSection" width="200" />
-        <slider bottom_delta="-20" can_edit_text="false" control_name="GridOpacity"
+        <slider bottom_delta="-20" can_edit_text="false" 
              decimal_digits="3" follows="left" height="16" increment="0.05"
              initial_val="0.7" label="Grid Opacity" left_delta="0" max_val="1" min_val="0"
              mouse_opaque="true" name="GridOpacity" show_text="false" value="0.7"
@@ -53,26 +53,25 @@
   
   <spinner bottom="-200" decimal_digits="5" follows="left|top" height="16" increment="0.05"
      label="X size" label_width="40" left="20" max_val="10" min_val="0.01"
-     mouse_opaque="true" name="X size" width="110" control_name="BuildPrefs_Xsize"/>
+     mouse_opaque="true" name="X size" width="110" />
   <spinner bottom_delta="-20" decimal_digits="5" follows="left|top" height="16" increment="0.05"
      label="Y size" label_width="40" left_delta="0" max_val="10" min_val="0.01"
-     mouse_opaque="true" name="Y size" width="110" control_name="BuildPrefs_Ysize"/>
+     mouse_opaque="true" name="Y size" width="110" />
   <spinner bottom_delta="-20" decimal_digits="5" follows="left|top" height="16" increment="0.05"
      label="Z size" label_width="40" left_delta="0" max_val="10" min_val="0.01"
-     mouse_opaque="true" name="Z size" width="110" control_name="BuildPrefs_Zsize"/>
+     mouse_opaque="true" name="Z size" width="110" />
   
   <check_box bottom="-200" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
      label="Phantom" left="154" mouse_opaque="true" name="PhantomToggle" radio_style="false"
-     width="100" control_name="BuildPrefs_Phantom"/>
+     width="100" />
   <check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
      label="Physical" left_delta="0" mouse_opaque="true" name="PhysicalToggle" radio_style="false"
-     width="100" control_name="BuildPrefs_Physical"/>
+     width="100" />
   <check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
      label="Temporary" left_delta="0" mouse_opaque="true" name="TemporaryToggle" radio_style="false"
-     width="100" control_name="BuildPrefs_Temporary"/>
+     width="100" />
   <combo_box allow_text_entry="false" bottom_delta="-20" left_delta="1" follows="left|top" height="18"
-     left="10" max_chars="20" mouse_opaque="true" name="material" width="87"
-     control_name="BuildPrefs_Material">
+     left="10" max_chars="20" mouse_opaque="true" name="material" width="87">
     <combo_item name="Stone" value="Stone">Stone</combo_item>
     <combo_item name="Metal" value="Metal">Metal</combo_item>
     <combo_item name="Glass" value="Glass">Glass</combo_item>
@@ -84,25 +83,24 @@
   
   <texture_picker allow_no_texture="false" bottom="-265" can_apply_immediately="true" default_image_name="Default"
      follows="left|top" height="80" label="Texture" left="270" mouse_opaque="true"
-     name="texture control" control_name="BuildPrefs_Texture" tool_tip="Click to choose a picture"
+     name="texture control" tool_tip="Click to choose a picture"
      width="64"/>
   <color_swatch border_color="0.45098, 0.517647, 0.607843, 1" bottom_delta="0" can_apply_immediately="true"
      color="1, 1, 1, 1" follows="left|top" height="80" label="Color" left_delta="75"
-     mouse_opaque="true" name="colorswatch" tool_tip="Click to open Color Picker" width="64"
-     control_name="BuildPrefs_Color"/>
+     mouse_opaque="true" name="colorswatch" tool_tip="Click to open Color Picker" width="64" />
   
   <spinner bottom="-200" decimal_digits="0" follows="left|top" height="16" increment="1"
      label="Alpha" label_width="40" left_delta="70" max_val="100" min_val="0"
-     mouse_opaque="true" name="alpha" width="90" control_name="BuildPrefs_Alpha"/>
+     mouse_opaque="true" name="alpha" width="90" />
   <spinner bottom_delta="-20" enabled="true" decimal_digits="2" follows="left|top" height="16"
      increment="0.05" label="Glow" label_width="40" left_delta="0" max_val="1"
-     min_val="0" mouse_opaque="true" name="glow" width="90" control_name="BuildPrefs_Glow"/>
+     min_val="0" mouse_opaque="true" name="glow" width="90" />
   <check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
      label="Full Bright" left_delta="0" mouse_opaque="true" name="FBToggle" radio_style="false"
-     width="100" control_name="BuildPrefs_FullBright"/>
+     width="100" />
   <combo_box allow_text_entry="false" bottom_delta="-20" follows="left|top" height="18" left_delta="0"
      max_chars="20" mouse_opaque="true" name="combobox shininess" tool_tip="Set the amount of shine for the object"
-     width="90" control_name="BuildPrefs_Shiny">
+     width="90">
     <combo_item name="None" value="None">          None</combo_item>
     <combo_item name="Low" value="Low">          Low</combo_item>
     <combo_item name="Medium" value="Medium">          Medium</combo_item>
@@ -117,14 +115,17 @@
      v_pad="2" width="400">        Drop an inventory item here to have it added to the prim contents.</text>
   <view_border blevel_style="in" bottom_delta="-18" follows="left|top" height="16" left_delta="0"
      mouse_opaque="false" name="build_item_add_disp_rect" width="400"/>
+  <button bottom_delta="0" enabled="true" font="SansSerif" halign="center" height="20"
+     label="Clear Item" left_delta="405" mouse_opaque="true"
+     name="btn_clear" scale_image="true" width="90" />
   <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" bottom_delta="0"
      drop_shadow_visible="true" follows="left|top" font="SansSerifSmall" h_pad="0" halign="center"
-     height="16" left_delta="0" mouse_opaque="true" name="build_item_add_disp_rect_txt" tool_tip=""
+     height="16" left="14" mouse_opaque="true" name="build_item_add_disp_rect_txt" tool_tip=""
      v_pad="2" width="400">        Currently set to: ITEM</text>
   <check_box name="BuildPrefsEmbedItem" bottom_delta="-25" enabled="true" 
      follows="left|top" font="SansSerifSmall" height="16"
      initial_value="false" label="Embed an item into the newly created object" left_delta="0"
-     mouse_opaque="true" control_name="BuildPrefs_EmbedItem" radio_style="false" width="270"/>
+     mouse_opaque="true" radio_style="false" width="270" />
   
   <view_border bevel_style="none" border_thickness="1" bottom="-145" follows="top|left" height="105"
      left="198" name="PivotBorder" width="135"/>
@@ -134,28 +135,41 @@
      name="text_box6" v_pad="0" width="150">        Pivot Point</text>
   <spinner bottom_delta="-25" decimal_digits="5" follows="left|top" height="16" increment="0.05"
      label="X pos" label_width="40" left_delta="-28" mouse_opaque="true" max_val="256"
-     min_val="-256" name="X pos" width="120" control_name="BuildPrefs_PivotX"/>
+     min_val="-256" name="X pos" width="120" />
   <spinner bottom_delta="-20" decimal_digits="5" follows="left|top" height="16" increment="0.05"
      label="Y pos" label_width="40" left_delta="0" mouse_opaque="true" max_val="256"
-     min_val="-256" name="Y pos" width="120" control_name="BuildPrefs_PivotY"/>
+     min_val="-256" name="Y pos" width="120" />
   <spinner bottom_delta="-20" decimal_digits="5" follows="left|top" height="16" increment="0.05"
      label="Z pos" label_width="40" left_delta="0" mouse_opaque="true" max_val="256"
-     min_val="-256" name="Z pos" width="120" control_name="BuildPrefs_PivotZ"/>
+     min_val="-256" name="Z pos" width="120" />
   <check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
      label="Values are percent" left_delta="-5" mouse_opaque="true" tool_tip="Default settings are Percentages and every axis set at 50"
-     name="PivotPercToggle" radio_style="false" width="100" control_name="BuildPrefs_PivotIsPercent"/>
+     name="PivotPercToggle" radio_style="false" width="100" />
   
   <check_box bottom_delta="60" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
                                          initial_value="true" label="Highlight selected prims" left_delta="143"
-                                         mouse_opaque="true" name="BuildPrefsRenderHighlight_toggle" control_name="RenderHighlightSelections"
+                                         mouse_opaque="true" name="BuildPrefsRenderHighlight_toggle" 
                                          radio_style="false" width="270"/>
   <check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
      initial_value="false" label="Show axis on root prim" left_delta="0"
      mouse_opaque="true" tool_tip="Default behaviour is to show the axis on the center of mass of a linkset. If enabled, the axis will be shown on the root prim of the linkset instead."
-     name="BuildPrefsActualRoot_toggle" control_name="BuildPrefs_ActualRoot"
-     radio_style="false" width="270"/>
+     name="BuildPrefsActualRoot_toggle" radio_style="false" width="270" />
   <check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
      label="Rez objects using land group" left_delta="0" mouse_opaque="true"
      tooltip="Rez objects on group land using the land's group (if possible)" 
-     name="grouplandrez" radio_style="false" width="270" control_name="RezWithLandGroup"/>
+     name="grouplandrez" radio_style="false" width="270" />
+
+  <button bottom="2" enabled="true" follows="right|bottom" font="SansSerif"
+             halign="center" height="20" label="Cancel" right="-4" 
+       mouse_opaque="true" name="btn_cancel" scale_image="true" width="90" />
+  <button bottom_delta="0" enabled="true" follows="right|bottom" font="SansSerif"
+       halign="center" height="20" label="Apply" left_delta="-93"
+       mouse_opaque="true" name="btn_apply" scale_image="true" width="90" />
+  <button bottom_delta="0" enabled="true" follows="right|bottom" font="SansSerif"
+       halign="center" height="20" label="OK" left_delta="-93"
+       mouse_opaque="true" name="btn_ok" scale_image="true" width="90" />
+  <button bottom_delta="0" enabled="true" follows="left|bottom" font="SansSerif"
+             halign="center" height="20" label="Reset to Defaults"
+             left="2" mouse_opaque="true" name="btn_reset" scale_image="true"
+             width="160" />
 </floater>