2 files changed, 4 insertions, 4 deletions

diff --git a/linden/indra/newview/floaterbusy.h b/linden/indra/newview/floaterbusy.h
index 821d00d..c3d149f 100644
--- a/linden/indra/newview/floaterbusy.h
+++ b/linden/indra/newview/floaterbusy.h
@@ -85,4 +85,4 @@ private:
         static void IMAutoResponseItemDrop(LLViewerInventoryItem* item);
 };
 
-#endif FLOATERBUSY_H
+#endif // FLOATERBUSY_H
diff --git a/linden/indra/newview/llfloaterbuildoptions.cpp b/linden/indra/newview/llfloaterbuildoptions.cpp
index 6cbb9fe..ad15615 100644
--- a/linden/indra/newview/llfloaterbuildoptions.cpp
+++ b/linden/indra/newview/llfloaterbuildoptions.cpp
@@ -326,10 +326,10 @@ void LLFloaterBuildOptions::reset()
         childSetValue("X size", gSavedPerAccountSettings.getControl("BuildPrefs_Xsize")->getDefault() );
 
         getChild<LLColorSwatchCtrl>("colorswatch")->set(gSavedPerAccountSettings.getControl("BuildPrefs_Color")->getDefault(), TRUE);
-        getChild<LLTextureCtrl>("texture control")->setImageAssetID(LLUUID(gSavedPerAccountSettings.getControl("BuildPrefs_Texture")->getDefault()) );
+        getChild<LLTextureCtrl>("texture control")->setImageAssetID( (LLUUID)gSavedPerAccountSettings.getControl("BuildPrefs_Texture")->getDefault().asString() );
 
-        mBuildItemUUID = (LLUUID)gSavedPerAccountSettings.getControl("BuildPrefs_Item")->getDefault();
-        mBuildTextureUUID = (LLUUID)gSavedPerAccountSettings.getControl("BuildPrefs_Texture")->getDefault();
+        mBuildItemUUID = (LLUUID)gSavedPerAccountSettings.getControl("BuildPrefs_Item")->getDefault().asString();
+        mBuildTextureUUID = (LLUUID)gSavedPerAccountSettings.getControl("BuildPrefs_Texture")->getDefault().asString();
 
         childSetValue("BuildPrefsRenderHighlight_toggle", gSavedSettings.getControl("RenderHighlightSelections")->getDefault() );
         childSetValue("grouplandrez", gSavedSettings.getControl("RezWithLandGroup")->getDefault() );