Ported Emerald build preferences and added them to llfloaterbuildoptions instead

9 files changed, 660 insertions, 28 deletions

diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index 9f2854b..a1e335d 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -15,6 +15,231 @@
     <key>Value</key>
     <integer>1</integer>
   </map>
+  <key>BuildPrefs_Xsize</key>
+  <map>
+    <key>Comment</key>
+    <string>Default Size For New Objects to be created X</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>F32</string>
+    <key>Value</key>
+    <real>0.5</real>
+  </map>
+  <key>BuildPrefs_Ysize</key>
+  <map>
+    <key>Comment</key>
+    <string>Default Size For New Objects to be created Y</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>F32</string>
+    <key>Value</key>
+    <real>0.5</real>
+  </map>
+  <key>BuildPrefs_Zsize</key>
+  <map>
+    <key>Comment</key>
+    <string>Default Size For New Objects to be created Z</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>F32</string>
+    <key>Value</key>
+    <real>0.5</real>
+  </map>
+  <key>BuildPrefs_Phantom</key>
+  <map>
+    <key>Comment</key>
+    <string>Default Setting For New Objects to be created, phantom flag</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>Boolean</string>
+    <key>Value</key>
+    <integer>0</integer>
+  </map>
+  <key>BuildPrefs_Temporary</key>
+  <map>
+    <key>Comment</key>
+    <string>Default Setting For New Objects to be created, temp flag</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>Boolean</string>
+    <key>Value</key>
+    <integer>0</integer>
+  </map>
+  <key>BuildPrefs_Physical</key>
+  <map>
+    <key>Comment</key>
+    <string>Default Setting For New Objects to be created, physical flag</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>Boolean</string>
+    <key>Value</key>
+    <integer>0</integer>
+  </map>
+  <key>BuildPrefs_EmbedItem</key>
+  <map>
+    <key>Comment</key>
+    <string>Whether to add item to objects</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>Boolean</string>
+    <key>Value</key>
+    <integer>0</integer>
+  </map>
+  <key>BuildPrefs_Material</key>
+  <map>
+    <key>Comment</key>
+    <string>Default Setting For New Objects to be created, physical flag</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>String</string>
+    <key>Value</key>
+    <string>Wood</string>
+  </map>
+  <key>BuildPrefs_Color</key>
+  <map>
+    <key>Comment</key>
+    <string>Color of new objects textures</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>Color4</string>
+    <key>Value</key>
+    <array>
+      <real>1.0</real>
+      <real>1.0</real>
+      <real>1.0</real>
+      <real>1.0</real>
+    </array>
+  </map>
+  <key>BuildPrefs_Texture</key>
+  <map>
+    <key>Comment</key>
+    <string>Texture used as 'Default' for new object created</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>String</string>
+    <key>Value</key>
+    <string>89556747-24cb-43ed-920b-47caed15465f</string>
+  </map>
+  <key>BuildPrefs_Item</key>
+  <map>
+    <key>Comment</key>
+    <string>item added to new object created</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>String</string>
+    <key>Value</key>
+    <string></string>
+  </map>
+  <key>BuildPrefs_Alpha</key>
+  <map>
+    <key>Comment</key>
+    <string>Default Alpha For New Objects to be created</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>F32</string>
+    <key>Value</key>
+    <real>0.0</real>
+  </map>
+  <key>BuildPrefs_Glow</key>
+  <map>
+    <key>Comment</key>
+    <string>Default Glow For New Objects to be created</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>F32</string>
+    <key>Value</key>
+    <real>0.0</real>
+  </map>
+  <key>BuildPrefs_FullBright</key>
+  <map>
+    <key>Comment</key>
+    <string>Default Setting For New Objects to be created, whether textures are full bright</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>Boolean</string>
+    <key>Value</key>
+    <integer>0</integer>
+  </map>
+  <key>BuildPrefs_Shiny</key>
+  <map>
+    <key>Comment</key>
+    <string>Shiny level used as 'Default' for new objects created</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>String</string>
+    <key>Value</key>
+    <string>None</string>
+  </map>
+  <key>BuildPrefs_PivotX</key>
+  <map>
+    <key>Comment</key>
+    <string>Pivot point on the X axis</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>F32</string>
+    <key>Value</key>
+    <real>50</real>
+  </map>
+  <key>BuildPrefs_PivotY</key>
+  <map>
+    <key>Comment</key>
+    <string>Pivot point on the Y axis</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>F32</string>
+    <key>Value</key>
+    <real>50</real>
+  </map>
+  <key>BuildPrefs_PivotZ</key>
+  <map>
+    <key>Comment</key>
+    <string>Pivot point on the Z axis</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>F32</string>
+    <key>Value</key>
+    <real>50</real>
+  </map>
+  <key>BuildPrefs_PivotIsPercent</key>
+  <map>
+    <key>Comment</key>
+    <string>Consider the Pivot points values as a percentage</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>Boolean</string>
+    <key>Value</key>
+    <integer>1</integer>
+  </map>
+  <key>BuildPrefs_ActualRoot</key>
+  <map>
+    <key>Comment</key>
+    <string>Show the axis on the actual root of a linkset instead of mass center</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>Boolean</string>
+    <key>Value</key>
+    <integer>0</integer>
+  </map>
   <key>DisableLoginLogoutScreens</key>
   <map>
     <key>Comment</key>
diff --git a/linden/indra/newview/llfloaterbuildoptions.cpp b/linden/indra/newview/llfloaterbuildoptions.cpp
index 3cd35db..472f6bb 100644
--- a/linden/indra/newview/llfloaterbuildoptions.cpp
+++ b/linden/indra/newview/llfloaterbuildoptions.cpp
@@ -43,17 +43,24 @@
 // library includes
 #include "llfontgl.h"
 #include "llcheckboxctrl.h"
+#include "llcombobox.h"
 #include "llspinctrl.h"
 #include "llsliderctrl.h"
+#include "lltexturectrl.h"
 
 // newview includes
+#include "llinventorymodel.h"
 #include "llresmgr.h"
+#include "llstartup.h" // not really necessary here, but just in case
 #include "llviewercontrol.h"
+#include "llviewerinventory.h"
+#include "floaterbusy.h" // class InvDropTarget
 
 //
 // Globals
 //
 LLFloaterBuildOptions   *LLFloaterBuildOptions::sInstance = NULL;
+InvDropTarget * LLFloaterBuildOptions::mBuildObjectDropTarget;
 
 //
 // Methods
@@ -67,6 +74,55 @@ LLFloaterBuildOptions::LLFloaterBuildOptions( )
 LLFloaterBuildOptions::~LLFloaterBuildOptions()
 {
         sInstance = NULL;
+        delete mBuildObjectDropTarget;
+        mBuildObjectDropTarget = NULL;
+}
+
+BOOL LLFloaterBuildOptions::postBuild()
+{
+        getChild<LLComboBox>("material")->setSimple(gSavedSettings.getString("BuildPrefs_Material"));
+        getChild<LLComboBox>("combobox shininess")->setSimple(gSavedSettings.getString("BuildPrefs_Shiny"));
+
+        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);
+
+        LLView *target_view = getChild<LLView>("build_item_add_disp_rect");
+        if (target_view)
+        {
+                if (mBuildObjectDropTarget) 
+                {
+                        delete mBuildObjectDropTarget;
+                }
+                mBuildObjectDropTarget = new InvDropTarget("build drop target", target_view->getRect(),BuildAutoResponseItemDrop);
+                addChild(mBuildObjectDropTarget);
+        }
+
+        if (LLStartUp::getStartupState() == STATE_STARTED)
+        {
+                LLUUID itemid = (LLUUID)gSavedSettings.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");
+        }
+
+        return TRUE;
 }
 
 // static
@@ -95,3 +151,28 @@ BOOL LLFloaterBuildOptions::visible(void*)
 {
         return (sInstance != NULL);
 }
+
+void LLFloaterBuildOptions::BuildAutoResponseItemDrop(LLViewerInventoryItem* item)
+{
+        gSavedSettings.setString("BuildPrefs_Item", item->getUUID().asString());
+        LLFloaterBuildOptions::getInstance()->childSetValue("build_item_add_disp_rect_txt", "Currently set to: "+item->getName());
+}
+
+void LLFloaterBuildOptions::onComboBoxCommit(LLUICtrl* ctrl, void* userdata)
+{
+        
+        LLComboBox* box = (LLComboBox*)ctrl;
+        if(box)
+        {
+                gSavedSettings.setString(box->getControlName(), box->getValue().asString());
+        }       
+}
+
+void LLFloaterBuildOptions::onTexturePickerCommit(LLUICtrl* ctrl, void* userdata)
+{
+        LLTextureCtrl*  image_ctrl = (LLTextureCtrl*)ctrl;
+        if(image_ctrl)
+        {
+                gSavedSettings.setString("BuildPrefs_Texture", image_ctrl->getImageAssetID().asString());
+        }
+}
diff --git a/linden/indra/newview/llfloaterbuildoptions.h b/linden/indra/newview/llfloaterbuildoptions.h
index e030b06..50599dd 100644
--- a/linden/indra/newview/llfloaterbuildoptions.h
+++ b/linden/indra/newview/llfloaterbuildoptions.h
@@ -40,6 +40,8 @@
 
 #include "llfloater.h"
 
+class LLViewerInventoryItem;
+class InvDropTarget;
 
 class LLFloaterBuildOptions
 :       public LLFloater
@@ -49,12 +51,21 @@ protected:
         ~LLFloaterBuildOptions();
 
 public:
+        BOOL                    postBuild();
+
         static void             show(void*);
         static LLFloaterBuildOptions* getInstance();
         static BOOL             visible(void*);
 
 protected:
         static LLFloaterBuildOptions*   sInstance;
+
+private:
+        static InvDropTarget* mBuildObjectDropTarget;
+
+        static void onTexturePickerCommit(LLUICtrl* ctrl, void* userdata);
+        static void onComboBoxCommit(LLUICtrl* ctrl, void* userdata);
+        static void BuildAutoResponseItemDrop(LLViewerInventoryItem* item);
 };
 
 #endif
diff --git a/linden/indra/newview/llmanip.cpp b/linden/indra/newview/llmanip.cpp
index 53c74aa..fd24f6d 100644
--- a/linden/indra/newview/llmanip.cpp
+++ b/linden/indra/newview/llmanip.cpp
@@ -69,7 +69,11 @@ S32		LLManip::sMaxTimesShowHelpText = 5;
 F32             LLManip::sGridMaxSubdivisionLevel = 32.f;
 F32             LLManip::sGridMinSubdivisionLevel = 1.f;
 LLVector2 LLManip::sTickLabelSpacing(60.f, 25.f);
-
+bool    LLManip::sActualRoot = false;// going to set these up in the main entry
+bool    LLManip::sPivotPerc  = false;
+F32             LLManip::sPivotX         = 0.f;
+F32             LLManip::sPivotY         = 0.f;
+F32             LLManip::sPivotZ         = 0.f;
 
 //static
 void LLManip::rebuild(LLViewerObject* vobj)
@@ -100,8 +104,48 @@ LLManip::LLManip( const std::string& name, LLToolComposite* composite )
         mHighlightedPart(LL_NO_PART),
         mManipPart(LL_NO_PART)
 {
-}
+        initPivot();
 
+        gSavedSettings.getControl("BuildPrefs_ActualRoot")->getSignal()->connect(&updateActualRoot);
+        gSavedSettings.getControl("BuildPrefs_PivotIsPercent")->getSignal()->connect(&updatePivotIsPercent);
+        gSavedSettings.getControl("BuildPrefs_PivotX")->getSignal()->connect(&updatePivotX);
+        gSavedSettings.getControl("BuildPrefs_PivotY")->getSignal()->connect(&updatePivotY);
+        gSavedSettings.getControl("BuildPrefs_PivotZ")->getSignal()->connect(&updatePivotZ);
+}
+//static
+void LLManip::initPivot()
+{
+        sActualRoot = (bool)gSavedSettings.getBOOL("BuildPrefs_ActualRoot");
+        sPivotPerc  = (bool)gSavedSettings.getBOOL("BuildPrefs_PivotIsPercent");
+        sPivotX         = gSavedSettings.getF32("BuildPrefs_PivotX");
+        sPivotY         = gSavedSettings.getF32("BuildPrefs_PivotY");
+        sPivotZ         = gSavedSettings.getF32("BuildPrefs_PivotZ");
+}
+//static
+void LLManip::updateActualRoot(const LLSD &data)
+{
+        sActualRoot = (bool)data.asBoolean();
+}
+//static
+void LLManip::updatePivotIsPercent(const LLSD &data)
+{
+        sPivotPerc = (bool)data.asBoolean();
+}
+//static
+void LLManip::updatePivotX(const LLSD &data)
+{
+        sPivotX = (F32)data.asReal();
+}
+//static
+void LLManip::updatePivotY(const LLSD &data)
+{
+        sPivotY = (F32)data.asReal();
+}
+//static
+void LLManip::updatePivotZ(const LLSD &data)
+{
+        sPivotZ = (F32)data.asReal();
+}
 void LLManip::getManipNormal(LLViewerObject* object, EManipPart manip, LLVector3 &normal)
 {
         LLVector3 grid_origin;
@@ -351,11 +395,43 @@ LLVector3 LLManip::getSavedPivotPoint() const
 
 LLVector3 LLManip::getPivotPoint()
 {
-        if (mObjectSelection->getFirstObject() && mObjectSelection->getObjectCount() == 1 && mObjectSelection->getSelectType() != SELECT_TYPE_HUD)
+        LLVector3 pos;
+        LLVector3 scale;
+        LLQuaternion rot;// = mObjectSelection->getFirstObject()->getRotation();
+        if (mObjectSelection->getFirstRootObject(TRUE) && (mObjectSelection->getObjectCount() == 1 || sActualRoot) && mObjectSelection->getSelectType() != SELECT_TYPE_HUD)
+        {
+                pos = mObjectSelection->getFirstRootObject(TRUE)->getPivotPositionAgent();
+                scale = mObjectSelection->getFirstRootObject(TRUE)->getScale();
+                rot = mObjectSelection->getFirstRootObject(TRUE)->getRotation();
+        }else
+        {
+                pos = LLSelectMgr::getInstance()->getBBoxOfSelection().getCenterAgent();
+                scale = LLSelectMgr::getInstance()->getBBoxOfSelection().getExtentLocal();
+                rot = LLSelectMgr::getInstance()->getBBoxOfSelection().getRotation();
+        }
+        if(sPivotPerc)
+        {
+                
+                LLVector3 add(
+                        (-scale[VX]*0.5) + (scale[VX]*(sPivotX*0.01)),
+                        (-scale[VY]*0.5) + (scale[VY]*(sPivotY*0.01)),
+                        (-scale[VZ]*0.5) + (scale[VZ]*(sPivotZ*0.01)));
+                add = add * rot;
+                pos = pos + add;
+        }else
         {
-                return mObjectSelection->getFirstObject()->getPivotPositionAgent();
+                //pos[VX] = pos[VX] + gSavedSettings.getF32("BuildPrefs_PivotX");
+                //pos[VY] = pos[VY] + gSavedSettings.getF32("BuildPrefs_PivotY");
+                //pos[VZ] = pos[VZ] + gSavedSettings.getF32("BuildPrefs_PivotZ");
+                LLVector3 add(
+                        sPivotX,
+                        sPivotY,
+                        sPivotZ);
+                add = add * rot;
+                pos = pos + add;
         }
-        return LLSelectMgr::getInstance()->getBBoxOfSelection().getCenterAgent();
+        //pos = pos * rot;
+        return pos;
 }
 
 
diff --git a/linden/indra/newview/llmanip.h b/linden/indra/newview/llmanip.h
index cdf6a36..38672fe 100644
--- a/linden/indra/newview/llmanip.h
+++ b/linden/indra/newview/llmanip.h
@@ -151,6 +151,13 @@ protected:
         BOOL                            getMousePointOnPlaneAgent(LLVector3& point, S32 x, S32 y, LLVector3 origin, LLVector3 normal);
         BOOL                            nearestPointOnLineFromMouse( S32 x, S32 y, const LLVector3& b1, const LLVector3& b2, F32 &a_param, F32 &b_param );
         LLColor4                        setupSnapGuideRenderPass(S32 pass);
+private:
+        static void                     initPivot();
+        static void                     updateActualRoot(const LLSD &data);
+        static void                     updatePivotIsPercent(const LLSD &data);
+        static void                     updatePivotX(const LLSD &data);
+        static void                     updatePivotY(const LLSD &data);
+        static void                     updatePivotZ(const LLSD &data);
 protected:
         LLFrameTimer            mHelpTextTimer;
         BOOL                            mInSnapRegime;
@@ -165,6 +172,12 @@ protected:
         static F32                      sGridMaxSubdivisionLevel;
         static F32                      sGridMinSubdivisionLevel;
         static LLVector2        sTickLabelSpacing;
+
+        static bool                     sActualRoot;
+        static bool                     sPivotPerc;
+        static F32                      sPivotX;
+        static F32                      sPivotY;
+        static F32                      sPivotZ;
 };
 
 
diff --git a/linden/indra/newview/lltoolplacer.cpp b/linden/indra/newview/lltoolplacer.cpp
index d52d97c..dc4d6bf 100644
--- a/linden/indra/newview/lltoolplacer.cpp
+++ b/linden/indra/newview/lltoolplacer.cpp
@@ -216,8 +216,22 @@ BOOL LLToolPlacer::addObject( LLPCode pcode, S32 x, S32 y, U8 use_physics )
 
         // Set params for new object based on its PCode.
         LLQuaternion    rotation;
-        LLVector3               scale = DEFAULT_OBJECT_SCALE;
+        LLVector3               scale = LLVector3(
+                gSavedSettings.getF32("BuildPrefs_Xsize"),
+                gSavedSettings.getF32("BuildPrefs_Ysize"),
+                gSavedSettings.getF32("BuildPrefs_Zsize"));
+        
         U8                              material = LL_MCODE_WOOD;
+        if(gSavedSettings.getString("BuildPrefs_Material")== "Stone") material = LL_MCODE_STONE;
+        if(gSavedSettings.getString("BuildPrefs_Material")== "Metal") material = LL_MCODE_METAL;
+        if(gSavedSettings.getString("BuildPrefs_Material")== "Wood") material = LL_MCODE_WOOD;
+        if(gSavedSettings.getString("BuildPrefs_Material")== "Flesh") material = LL_MCODE_FLESH;
+        if(gSavedSettings.getString("BuildPrefs_Material")== "Rubber") material = LL_MCODE_RUBBER;
+        if(gSavedSettings.getString("BuildPrefs_Material")== "Plastic") material = LL_MCODE_PLASTIC;
+                
+
+        
+
         BOOL                    create_selected = FALSE;
         LLVolumeParams  volume_params;
         
@@ -284,7 +298,7 @@ BOOL LLToolPlacer::addObject( LLPCode pcode, S32 x, S32 y, U8 use_physics )
         gMessageSystem->addU8Fast(_PREHASH_Material,    material);
 
         U32 flags = 0;          // not selected
-        if (use_physics)
+        if (use_physics || gSavedSettings.getBOOL("BuildPrefs_Physical"))
         {
                 flags |= FLAGS_USE_PHYSICS;
         }
diff --git a/linden/indra/newview/llviewerobjectlist.cpp b/linden/indra/newview/llviewerobjectlist.cpp
index 21a9252..78f374c 100644
--- a/linden/indra/newview/llviewerobjectlist.cpp
+++ b/linden/indra/newview/llviewerobjectlist.cpp
@@ -60,6 +60,7 @@
 #include "llresmgr.h"
 #include "llviewerregion.h"
 #include "llviewerstats.h"
+#include "lltooldraganddrop.h"
 #include "lltoolmgr.h"
 #include "lltoolpie.h"
 #include "llkeyboard.h"
@@ -96,6 +97,7 @@ U32						LLViewerObjectList::sSimulatorMachineIndex = 1; // Not zero deliberatel
 LLMap<U64, U32>                 LLViewerObjectList::sIPAndPortToIndex;
 std::map<U64, LLUUID>   LLViewerObjectList::sIndexAndLocalIDToUUID;
 
+
 LLViewerObjectList::LLViewerObjectList()
 {
         mNumVisCulled = 0;
@@ -256,6 +258,85 @@ void LLViewerObjectList::processUpdateCore(LLViewerObject* objectp,
         // (from gPipeline.addObject)
         // so that the drawable parent is set properly
         findOrphans(objectp, msg->getSenderIP(), msg->getSenderPort());
+
+        // Apply custom settings not set in llmanip and lltoolplacer here.
+        // Don't check for permissions in case opensim ever implements
+        // default prim permission support serverside -- MC
+        if (objectp 
+                && just_created 
+                && objectp->permYouOwner()
+                && objectp->mCreateSelected)
+        {
+                LLMessageSystem* msg = gMessageSystem;
+                msg->newMessageFast(_PREHASH_ObjectImage);
+                msg->nextBlockFast(_PREHASH_AgentData);
+                msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
+                msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());    
+                msg->nextBlockFast(_PREHASH_ObjectData);                                
+                msg->addU32Fast(_PREHASH_ObjectLocalID,  (U32)(objectp->mLocalID));
+                msg->addStringFast(_PREHASH_MediaURL, NULL);
+
+                LLPrimitive obj;
+                obj.setNumTEs(U8(10));  
+                S32 shinnyLevel = 0;
+                if(gSavedSettings.getString("BuildPrefs_Shiny")== "None") shinnyLevel = 0;
+                if(gSavedSettings.getString("BuildPrefs_Shiny")== "Low") shinnyLevel = 1;
+                if(gSavedSettings.getString("BuildPrefs_Shiny")== "Medium") shinnyLevel = 2;
+                if(gSavedSettings.getString("BuildPrefs_Shiny")== "High") shinnyLevel = 3;
+                
+                for (int i = 0; i < 10; i++)
+                {
+                        // I'm assuming this is because there's no good workaround for setting the default 
+                        // box texture manually without restarting? -- MC
+                        LLTextureEntry tex =  LLTextureEntry(LLUUID(gSavedSettings.getString("BuildPrefs_Texture")));
+                        tex.setColor(gSavedSettings.getColor4("BuildPrefs_Color"));
+                        tex.setAlpha(1.0 - ((gSavedSettings.getF32("BuildPrefs_Alpha")) / 100.0));
+                        tex.setGlow(gSavedSettings.getF32("BuildPrefs_Glow"));
+                        if(gSavedSettings.getBOOL("BuildPrefs_FullBright"))
+                        {
+                                tex.setFullbright(TEM_FULLBRIGHT_MASK);
+                        }
+                                                        
+                        tex.setShiny((U8) shinnyLevel & TEM_SHINY_MASK);
+                        
+                        obj.setTE(U8(i), tex);
+                }
+
+                obj.packTEMessage(gMessageSystem);
+
+                msg->sendReliable(gAgent.getRegion()->getHost());
+                
+                msg->newMessage("ObjectFlagUpdate");
+                msg->nextBlockFast(_PREHASH_AgentData);
+                msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID() );
+                msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
+                msg->addU32Fast(_PREHASH_ObjectLocalID, (U32)(objectp->mLocalID) );
+                msg->addBOOLFast(_PREHASH_UsePhysics, gSavedSettings.getBOOL("BuildPrefs_Physical"));
+                msg->addBOOL("IsTemporary", gSavedSettings.getBOOL("BuildPrefs_Temporary"));
+                msg->addBOOL("IsPhantom", gSavedSettings.getBOOL("BuildPrefs_Phantom") );
+                msg->addBOOL("CastsShadows", true );
+                msg->sendReliable(gAgent.getRegion()->getHost());
+
+                if(gSavedSettings.getBOOL("BuildPrefs_EmbedItem"))
+                {
+                        LLViewerInventoryItem* item = (LLViewerInventoryItem*)gInventory.getItem((LLUUID)gSavedSettings.getString("BuildPrefs_Item"));
+                        if(item)
+                        {
+                                if(item->getType()==LLAssetType::AT_LSL_TEXT)
+                                {
+                                        LLToolDragAndDrop::dropScript(objectp,
+                                                item,
+                                                TRUE,
+                                                LLToolDragAndDrop::SOURCE_AGENT,
+                                                gAgent.getID());
+                                }else
+                                {
+                                        LLToolDragAndDrop::dropInventory(objectp,item,LLToolDragAndDrop::SOURCE_AGENT,gAgent.getID());
+                                }
+                        }
+                        //llinfos << "SENDING CUBE TEXTURE.." << llendl;
+                }
+        }
         
         // If we're just wandering around, don't create new objects selected.
         if (just_created 
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 6e6e65c..cdd5dc1 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,30 +1,161 @@
 <?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="165" min_height="165"
-     min_width="320" mouse_opaque="true" name="build options floater"
-     rect_control="FloaterBuildOptionsRect" title="Grid Options" width="320">
-        <spinner bottom="-53" control_name="GridResolution" decimal_digits="3"
+     can_resize="false" follows="right" height="355" min_height="355"
+     min_width="530" mouse_opaque="true" name="build options floater"
+     rect_control="FloaterBuildOptionsRect" title="Advanced Build Options" width="530">
+
+  <view_border bevel_style="none" border_thickness="1" bottom="-145" follows="top|left" height="105"
+       left="14" name="GridBorder" width="170"/>
+  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+       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"
              follows="left|top" height="16" increment="0.1" initial_val="1"
-             label="Grid Unit (meters)" label_width="110" left="14" max_val="5"
-             min_val="0.01" mouse_opaque="true" name="GridResolution" width="170" />
-        <spinner bottom_delta="-21" control_name="GridDrawSize" decimal_digits="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"
              follows="left|top" height="16" increment="0.5" initial_val="5"
-             label="Grid Extents (meters)" label_width="110" left="14" max_val="50"
-             min_val="1" mouse_opaque="true" name="GridDrawSize" width="170" />
-        <check_box bottom_delta="-21" control_name="GridSubUnit" follows="left|top"
+             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"
              font="SansSerifSmall" height="16" initial_value="false"
-             label="Enable Sub-Unit Snapping" left="14" mouse_opaque="true"
+             label="Sub-Unit Snapping" left_delta="0" mouse_opaque="true"
              name="GridSubUnit" width="200" />
-        <check_box bottom_delta="-21" control_name="GridCrossSections" follows="left|top"
+  <check_box bottom_delta="-20" control_name="GridCrossSections" follows="left|top"
              font="SansSerifSmall" height="16" initial_value="false"
-             label="Show Cross Sections" left="14" mouse_opaque="true"
+             label="Show Cross Sections" left_delta="0" mouse_opaque="true"
              name="GridCrossSection" width="200" />
-        <slider bottom_delta="-21" can_edit_text="false" control_name="GridOpacity"
+        <slider bottom_delta="-20" can_edit_text="false" control_name="GridOpacity"
              decimal_digits="3" follows="left" height="16" increment="0.05"
-             initial_val="0.7" label="Grid Opacity" left="14" max_val="1" min_val="0"
+             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"
-             width="200" />
+             width="165" />
+  
+  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                                         bottom_delta="-30" drop_shadow_visible="true" enabled="true" follows="left|top" font="SansSerifSmall"
+                                         h_pad="0" halign="left" height="10" left="44" mouse_opaque="false"
+                                         name="text_box3" v_pad="0" width="150">        Object Size</text>
+  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+     bottom_delta="0" drop_shadow_visible="true" enabled="true" follows="left|top" font="SansSerifSmall"
+     h_pad="0" halign="left" height="10" left_delta="130" mouse_opaque="false"
+     name="text_box4" v_pad="0" width="150">        Settings</text>
+  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+     bottom_delta="0" drop_shadow_visible="true" enabled="true" follows="left|top" font="SansSerifSmall"
+     h_pad="0" halign="left" height="10" left_delta="190" mouse_opaque="false"
+     name="text_box5" v_pad="0" width="150">        Texture</text>
+  <view_border bevel_style="none" border_thickness="1" bottom_delta="-98" follows="top|left" height="90"
+     left="14" name="SizeBorder" width="120" />
+  <view_border bevel_style="none" border_thickness="1" bottom_delta="-0" follows="top|left" height="90"
+     left_delta="134" name="SettingsBorder" width="100" />
+  <view_border bevel_style="none" border_thickness="1" bottom_delta="0" follows="top|left" height="90"
+     left_delta="114" name="TextureBorder" width="250" />
+  
+  <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"/>
+  <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"/>
+  <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"/>
+  
+  <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"/>
   <check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
-                         label="Rez objects under the land group when possible" left_delta="0" mouse_opaque="true"
-                         name="grouplandrez" radio_style="false" width="270" control_name="RezWithLandGroup"/>
+     label="Physical" left_delta="0" mouse_opaque="true" name="PhysicalToggle" radio_style="false"
+     width="100" control_name="BuildPrefs_Physical"/>
+  <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"/>
+  <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">
+    <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>
+    <combo_item name="Wood" value="Wood">Wood</combo_item>
+    <combo_item name="Flesh" value="Flesh">Flesh</combo_item>
+    <combo_item name="Plastic" value="Plastic">Plastic</combo_item>
+    <combo_item name="Rubber" value="Rubber">Rubber</combo_item>
+  </combo_box>
+  
+  <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"
+     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"/>
+  
+  <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"/>
+  <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"/>
+  <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"/>
+  <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">
+    <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>
+    <combo_item name="High" value="High">          High</combo_item>
+  </combo_box>
+  
+  <view_border blevel_style="in" bottom_delta="-40" follows="left|top" height="16" left="14"
+     mouse_opaque="false" name="im_give_drop_target_rect" width="400"/>
+  <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="Give inventory" tool_tip="Drop an inventory item here."
+     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"/>
+  <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=""
+     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"/>
+  
+  <view_border bevel_style="none" border_thickness="1" bottom="-145" follows="top|left" height="105"
+     left="198" name="PivotBorder" width="135"/>
+  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+     bottom_delta="110" drop_shadow_visible="true" enabled="true" follows="left|top" font="SansSerifSmall"
+     h_pad="0" halign="left" height="10" left_delta="35" mouse_opaque="false"
+     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"/>
+  <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"/>
+  <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"/>
+  <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"/>
+  
+  <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"
+                                         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"/>
+  <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"/>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml b/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml
index 959ebde..52275ea 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml
@@ -119,10 +119,10 @@
   <check_box bottom_delta="-19" control_name="SnapEnabled" follows="left|top"
              font="SansSerifSmall" height="16" initial_value="true" label="Use Grid"
              left_delta="0" mouse_opaque="true" name="checkbox snap to grid" width="134" />
-        <button bottom_delta="-19" follows="left|top" font="SansSerifSmall"
+        <button bottom_delta="-30" follows="left|top" font="SansSerifSmall"
        halign="center" valign="center"
-             height="20" label="Options..." label_selected="Options..." left_delta="20"
-             mouse_opaque="true" name="Options..." scale_image="TRUE" width="80" />
+             height="20" label="Build Options" left_delta="20"
+             mouse_opaque="true" name="Options..." scale_image="TRUE" width="100" />
 
 
 <!-- Help text -->