From 99eeeadc4853598367ea61e2ef8402193a7282b3 Mon Sep 17 00:00:00 2001
From: Kadah <none@none>
Date: Sun, 19 Jun 2011 22:23:46 -0700
Subject: [PATCH] Build Improvements: Default size and material controls

---
 indra/newview/app_settings/settings.xml | 45 +++++++++++++++++++++++++
 indra/newview/lltoolplacer.cpp          | 14 +++++++-
 2 files changed, 58 insertions(+), 1 deletion(-)

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index b8fb4e735d..b5a39aae34 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -14170,5 +14170,50 @@ Change of this parameter will affect the layout of buttons in notification toast
 			<key>Value</key>
 			<real>50</real>
 		</map>
+		<key>PhoenixBuildPrefs_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>PhoenixBuildPrefs_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>PhoenixBuildPrefs_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>PhoenixBuildPrefs_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>
+		
 </map>
 </llsd>
diff --git a/indra/newview/lltoolplacer.cpp b/indra/newview/lltoolplacer.cpp
index 0cfe4ca4ba..54a6df8a44 100644
--- a/indra/newview/lltoolplacer.cpp
+++ b/indra/newview/lltoolplacer.cpp
@@ -203,8 +203,20 @@ 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("PhoenixBuildPrefs_Xsize"),
+		gSavedSettings.getF32("PhoenixBuildPrefs_Ysize"),
+		gSavedSettings.getF32("PhoenixBuildPrefs_Zsize"));
+
 	U8				material = LL_MCODE_WOOD;
+	const std::string default_material = gSavedSettings.getString("PhoenixBuildPrefs_Material");
+	if (default_material == "Wood")			material = LL_MCODE_WOOD;
+	else if (default_material == "Stone")	material = LL_MCODE_STONE;
+	else if (default_material == "Metal")	material = LL_MCODE_METAL;
+	else if (default_material == "Flesh")	material = LL_MCODE_FLESH;
+	else if (default_material == "Rubber")	material = LL_MCODE_RUBBER;
+	else if (default_material == "Plastic")	material = LL_MCODE_PLASTIC;
+
 	BOOL			create_selected = FALSE;
 	LLVolumeParams	volume_params;