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 Value 50 + PhoenixBuildPrefs_Xsize + + Comment + Default Size For New Objects to be created X + Persist + 1 + Type + F32 + Value + 0.5 + + PhoenixBuildPrefs_Ysize + + Comment + Default Size For New Objects to be created Y + Persist + 1 + Type + F32 + Value + 0.5 + + PhoenixBuildPrefs_Zsize + + Comment + Default Size For New Objects to be created Z + Persist + 1 + Type + F32 + Value + 0.5 + + PhoenixBuildPrefs_Material + + Comment + Default Setting For New Objects to be created, physical flag + Persist + 1 + Type + String + Value + Wood + + 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;