livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Build Improvements: Default size and material controls

meow-7.2.2
Kadah 2011-06-19 22:23:46 -07:00
parent 0fb75778fa
commit 99eeeadc48
2 changed files with 58 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
indra/newview/app_settings/settings.xml
View File

@ -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>

14
indra/newview/lltoolplacer.cpp
View File

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