diff options
author | McCabe Maxsted | 2010-04-13 02:59:46 -0700 |
---|---|---|
committer | McCabe Maxsted | 2010-04-13 02:59:46 -0700 |
commit | deda3832abc642ffbfc0bfd00520a82ad402b884 (patch) | |
tree | b8c26bb9ee4b6da47bdde22012e00392db0a15bb /linden/indra/newview/llfloaterbuildoptions.cpp | |
parent | Ported Emerald build preferences and added them to llfloaterbuildoptions instead (diff) | |
download | meta-impy-deda3832abc642ffbfc0bfd00520a82ad402b884.zip meta-impy-deda3832abc642ffbfc0bfd00520a82ad402b884.tar.gz meta-impy-deda3832abc642ffbfc0bfd00520a82ad402b884.tar.bz2 meta-impy-deda3832abc642ffbfc0bfd00520a82ad402b884.tar.xz |
Save custom prim defaults on a per-account basis rather than globally
Diffstat (limited to '')
-rw-r--r-- | linden/indra/newview/llfloaterbuildoptions.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/linden/indra/newview/llfloaterbuildoptions.cpp b/linden/indra/newview/llfloaterbuildoptions.cpp index 472f6bb..6c59a4e 100644 --- a/linden/indra/newview/llfloaterbuildoptions.cpp +++ b/linden/indra/newview/llfloaterbuildoptions.cpp | |||
@@ -80,8 +80,8 @@ LLFloaterBuildOptions::~LLFloaterBuildOptions() | |||
80 | 80 | ||
81 | BOOL LLFloaterBuildOptions::postBuild() | 81 | BOOL LLFloaterBuildOptions::postBuild() |
82 | { | 82 | { |
83 | getChild<LLComboBox>("material")->setSimple(gSavedSettings.getString("BuildPrefs_Material")); | 83 | getChild<LLComboBox>("material")->setSimple(gSavedPerAccountSettings.getString("BuildPrefs_Material")); |
84 | getChild<LLComboBox>("combobox shininess")->setSimple(gSavedSettings.getString("BuildPrefs_Shiny")); | 84 | getChild<LLComboBox>("combobox shininess")->setSimple(gSavedPerAccountSettings.getString("BuildPrefs_Shiny")); |
85 | 85 | ||
86 | getChild<LLComboBox>("material")->setCommitCallback(onComboBoxCommit); | 86 | getChild<LLComboBox>("material")->setCommitCallback(onComboBoxCommit); |
87 | getChild<LLComboBox>("combobox shininess")->setCommitCallback(onComboBoxCommit); | 87 | getChild<LLComboBox>("combobox shininess")->setCommitCallback(onComboBoxCommit); |
@@ -102,7 +102,7 @@ BOOL LLFloaterBuildOptions::postBuild() | |||
102 | 102 | ||
103 | if (LLStartUp::getStartupState() == STATE_STARTED) | 103 | if (LLStartUp::getStartupState() == STATE_STARTED) |
104 | { | 104 | { |
105 | LLUUID itemid = (LLUUID)gSavedSettings.getString("BuildPrefs_Item"); | 105 | LLUUID itemid = (LLUUID)gSavedPerAccountSettings.getString("BuildPrefs_Item"); |
106 | LLViewerInventoryItem* item = gInventory.getItem(itemid); | 106 | LLViewerInventoryItem* item = gInventory.getItem(itemid); |
107 | if (item) | 107 | if (item) |
108 | { | 108 | { |
@@ -154,7 +154,7 @@ BOOL LLFloaterBuildOptions::visible(void*) | |||
154 | 154 | ||
155 | void LLFloaterBuildOptions::BuildAutoResponseItemDrop(LLViewerInventoryItem* item) | 155 | void LLFloaterBuildOptions::BuildAutoResponseItemDrop(LLViewerInventoryItem* item) |
156 | { | 156 | { |
157 | gSavedSettings.setString("BuildPrefs_Item", item->getUUID().asString()); | 157 | gSavedPerAccountSettings.setString("BuildPrefs_Item", item->getUUID().asString()); |
158 | LLFloaterBuildOptions::getInstance()->childSetValue("build_item_add_disp_rect_txt", "Currently set to: "+item->getName()); | 158 | LLFloaterBuildOptions::getInstance()->childSetValue("build_item_add_disp_rect_txt", "Currently set to: "+item->getName()); |
159 | } | 159 | } |
160 | 160 | ||
@@ -173,6 +173,6 @@ void LLFloaterBuildOptions::onTexturePickerCommit(LLUICtrl* ctrl, void* userdata | |||
173 | LLTextureCtrl* image_ctrl = (LLTextureCtrl*)ctrl; | 173 | LLTextureCtrl* image_ctrl = (LLTextureCtrl*)ctrl; |
174 | if(image_ctrl) | 174 | if(image_ctrl) |
175 | { | 175 | { |
176 | gSavedSettings.setString("BuildPrefs_Texture", image_ctrl->getImageAssetID().asString()); | 176 | gSavedPerAccountSettings.setString("BuildPrefs_Texture", image_ctrl->getImageAssetID().asString()); |
177 | } | 177 | } |
178 | } | 178 | } |