Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Properly comment out code so compilers quit whining about 'unreachable'.

Browse Source
This commit is contained in:
Router Gray
2019-05-24 06:34:03 -05:00
parent bf9e900731
commit 4329d46ac4
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
indra/newview/llfloaterbulkpermission.cpp
View File

@@ -342,12 +342,13 @@ void LLFloaterBulkPermission::handleInventory(LLViewerObject* viewer_obj, LLInve
//status_text.setArg("[STATUS]", getString("status_ok_text")); //status_text.setArg("[STATUS]", getString("status_ok_text"));
status_text.setArg("[STATUS]", ""); status_text.setArg("[STATUS]", "");
} }
#if 0
else else
{ {
//status_text.setArg("[STATUS]", getString("status_bad_text")); //status_text.setArg("[STATUS]", getString("status_bad_text"));
status_text.setArg("[STATUS]", ""); status_text.setArg("[STATUS]", "");
} }
#endif
list->addSimpleElement(status_text.getString()); list->addSimpleElement(status_text.getString());
//TODO if we are an object inside an object we should check a recuse flag and if set //TODO if we are an object inside an object we should check a recuse flag and if set

11
indra/newview/llpreviewgesture.cpp
View File

@@ -1050,12 +1050,9 @@ void LLPreviewGesture::saveIfNeeded()
LLDataPackerAsciiBuffer dp(buffer, max_size); LLDataPackerAsciiBuffer dp(buffer, max_size);
BOOL ok = gesture->serialize(dp); bool ok = gesture->serialize(dp);
#if 0 // <edit>
// <edit> if (dp.getCurrentSize() > 1000)
//if (dp.getCurrentSize() > 1000)
if(0)
// </edit>
{ {
LLNotificationsUtil::add("GestureSaveFailedTooManySteps"); LLNotificationsUtil::add("GestureSaveFailedTooManySteps");
@@ -1063,6 +1060,8 @@ void LLPreviewGesture::saveIfNeeded()
gesture = nullptr; gesture = nullptr;
} }
else if (!ok) else if (!ok)
#endif // </edit>
if (!ok)
{ {
LLNotificationsUtil::add("GestureSaveFailedTryAgain"); LLNotificationsUtil::add("GestureSaveFailedTryAgain");
delete gesture; delete gesture;