diff options
| author | McCabe Maxsted | 2010-04-26 10:50:22 -0700 |
|---|---|---|
| committer | McCabe Maxsted | 2010-04-26 10:50:22 -0700 |
| commit | 2cf50cc7ce1ad991336e8e2a8738a43d7d85fae9 (patch) | |
| tree | 7aaddfbf7403212ffd04da147ba3eccff8ac275b /linden | |
| parent | Rare crash fix from Hippo for payment dialog under lag (diff) | |
| parent | Fixed some compiler warnings that blocked Linux build. (diff) | |
| download | meta-impy-2cf50cc7ce1ad991336e8e2a8738a43d7d85fae9.zip meta-impy-2cf50cc7ce1ad991336e8e2a8738a43d7d85fae9.tar.gz meta-impy-2cf50cc7ce1ad991336e8e2a8738a43d7d85fae9.tar.bz2 meta-impy-2cf50cc7ce1ad991336e8e2a8738a43d7d85fae9.tar.xz | |
Merge commit 'jacek/next' into next
Diffstat (limited to 'linden')
| -rw-r--r-- | linden/indra/newview/floaterbusy.h | 2 | ||||
| -rw-r--r-- | linden/indra/newview/llfloaterbuildoptions.cpp | 6 |
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: | |||
| 85 | static void IMAutoResponseItemDrop(LLViewerInventoryItem* item); | 85 | static void IMAutoResponseItemDrop(LLViewerInventoryItem* item); |
| 86 | }; | 86 | }; |
| 87 | 87 | ||
| 88 | #endif FLOATERBUSY_H | 88 | #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() | |||
| 326 | childSetValue("X size", gSavedPerAccountSettings.getControl("BuildPrefs_Xsize")->getDefault() ); | 326 | childSetValue("X size", gSavedPerAccountSettings.getControl("BuildPrefs_Xsize")->getDefault() ); |
| 327 | 327 | ||
| 328 | getChild<LLColorSwatchCtrl>("colorswatch")->set(gSavedPerAccountSettings.getControl("BuildPrefs_Color")->getDefault(), TRUE); | 328 | getChild<LLColorSwatchCtrl>("colorswatch")->set(gSavedPerAccountSettings.getControl("BuildPrefs_Color")->getDefault(), TRUE); |
| 329 | getChild<LLTextureCtrl>("texture control")->setImageAssetID(LLUUID(gSavedPerAccountSettings.getControl("BuildPrefs_Texture")->getDefault()) ); | 329 | getChild<LLTextureCtrl>("texture control")->setImageAssetID( (LLUUID)gSavedPerAccountSettings.getControl("BuildPrefs_Texture")->getDefault().asString() ); |
| 330 | 330 | ||
| 331 | mBuildItemUUID = (LLUUID)gSavedPerAccountSettings.getControl("BuildPrefs_Item")->getDefault(); | 331 | mBuildItemUUID = (LLUUID)gSavedPerAccountSettings.getControl("BuildPrefs_Item")->getDefault().asString(); |
| 332 | mBuildTextureUUID = (LLUUID)gSavedPerAccountSettings.getControl("BuildPrefs_Texture")->getDefault(); | 332 | mBuildTextureUUID = (LLUUID)gSavedPerAccountSettings.getControl("BuildPrefs_Texture")->getDefault().asString(); |
| 333 | 333 | ||
| 334 | childSetValue("BuildPrefsRenderHighlight_toggle", gSavedSettings.getControl("RenderHighlightSelections")->getDefault() ); | 334 | childSetValue("BuildPrefsRenderHighlight_toggle", gSavedSettings.getControl("RenderHighlightSelections")->getDefault() ); |
| 335 | childSetValue("grouplandrez", gSavedSettings.getControl("RezWithLandGroup")->getDefault() ); | 335 | childSetValue("grouplandrez", gSavedSettings.getControl("RezWithLandGroup")->getDefault() ); |