From 4329d46ac4a774026c6d4db1fe3b925865f8e7e0 Mon Sep 17 00:00:00 2001 From: Router Gray Date: Fri, 24 May 2019 06:34:03 -0500 Subject: [PATCH] Properly comment out code so compilers quit whining about 'unreachable'. --- indra/newview/llfloaterbulkpermission.cpp | 3 ++- indra/newview/llpreviewgesture.cpp | 11 +++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/indra/newview/llfloaterbulkpermission.cpp b/indra/newview/llfloaterbulkpermission.cpp index 7fb149ee5..0fcdc7071 100644 --- a/indra/newview/llfloaterbulkpermission.cpp +++ b/indra/newview/llfloaterbulkpermission.cpp @@ -342,12 +342,13 @@ void LLFloaterBulkPermission::handleInventory(LLViewerObject* viewer_obj, LLInve //status_text.setArg("[STATUS]", getString("status_ok_text")); status_text.setArg("[STATUS]", ""); } +#if 0 else { //status_text.setArg("[STATUS]", getString("status_bad_text")); status_text.setArg("[STATUS]", ""); } - +#endif list->addSimpleElement(status_text.getString()); //TODO if we are an object inside an object we should check a recuse flag and if set diff --git a/indra/newview/llpreviewgesture.cpp b/indra/newview/llpreviewgesture.cpp index eb0bece56..aac1fa4d7 100644 --- a/indra/newview/llpreviewgesture.cpp +++ b/indra/newview/llpreviewgesture.cpp @@ -1050,12 +1050,9 @@ void LLPreviewGesture::saveIfNeeded() LLDataPackerAsciiBuffer dp(buffer, max_size); - BOOL ok = gesture->serialize(dp); - - // - //if (dp.getCurrentSize() > 1000) - if(0) - // + bool ok = gesture->serialize(dp); +#if 0 // + if (dp.getCurrentSize() > 1000) { LLNotificationsUtil::add("GestureSaveFailedTooManySteps"); @@ -1063,6 +1060,8 @@ void LLPreviewGesture::saveIfNeeded() gesture = nullptr; } else if (!ok) +#endif // + if (!ok) { LLNotificationsUtil::add("GestureSaveFailedTryAgain"); delete gesture;