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

FIRE-9678: Don't re-use the texture picker's default texture setting for the default texture of newly rezzed prims - people expect the plywood texture behind the default button

Ansariel 2013-04-06 20:11:13 +02:00
parent a79ed5af20
commit 66e9dd98d9
4 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -20400,5 +20400,16 @@ Change of this parameter will affect the layout of buttons in notification toast
<key>Value</key>
<integer>0</integer>
</map>
<key>FSDefaultObjectTexture</key>
<map>
<key>Comment</key>
<string>Default texture that will be applied to rezzed prims. (UUID texture reference)</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>String</string>
<key>Value</key>
<string>89556747-24cb-43ed-920b-47caed15465f</string>
</map>
</map>
</llsd>

2
indra/newview/fscommon.cpp
View File

@ -153,7 +153,7 @@ void FSCommon::applyDefaultBuildPreferences(LLViewerObject* object)
}
LLTextureEntry texture_entry;
texture_entry.setID(LLUUID(gSavedSettings.getString("DefaultObjectTexture")));
texture_entry.setID(LLUUID(gSavedSettings.getString("FSDefaultObjectTexture")));
texture_entry.setColor(gSavedSettings.getColor4("FSBuildPrefs_Color"));
texture_entry.setAlpha((100.f - gSavedSettings.getF32("FSBuildPrefs_Alpha")) / 100.f);
texture_entry.setGlow(gSavedSettings.getF32("FSBuildPrefs_Glow"));

4
indra/newview/fspanelprefs.cpp
View File

@ -48,7 +48,7 @@ BOOL PanelPreferenceFirestorm::postBuild()
LLTextureCtrl* tex_ctrl = getChild<LLTextureCtrl>("texture control");
tex_ctrl->setCommitCallback(boost::bind(&PanelPreferenceFirestorm::onCommitTexture, this, _2));
tex_ctrl->setDefaultImageAssetID(LL_DEFAULT_WOOD_UUID);
tex_ctrl->setDefaultImageAssetID(LLUUID(gSavedSettings.getString("DefaultObjectTexture")));
return LLPanelPreference::postBuild();
}
@ -290,7 +290,7 @@ void PanelPreferenceFirestorm::onCommitTexture(const LLSD& data)
return;
}
gSavedSettings.setString("DefaultObjectTexture", texture_ctrl->getImageAssetID().asString());
gSavedSettings.setString("FSDefaultObjectTexture", texture_ctrl->getImageAssetID().asString());
}
}

2
indra/newview/skins/default/xui/en/panel_preferences_firestorm.xml
View File

@ -1567,7 +1567,7 @@
left="275"
mouse_opaque="true"
name="texture control"
control_name="DefaultObjectTexture"
control_name="FSDefaultObjectTexture"
tool_tip="Click to choose a picture"
width="64"/>
<color_swatch