Ported Emerald build preferences and added them to llfloaterbuildoptions instead

1 files changed, 16 insertions, 2 deletions

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;
         }