STORM-68 Remove obsolete note. Refactor a few blocks of code to not have early returns

4 files changed, 60 insertions, 60 deletions

diff --git a/indra/newview/llagentwearables.cpp b/indra/newview/llagentwearables.cpp
index f71b49010d..aa97bddec8 100755
--- a/indra/newview/llagentwearables.cpp
+++ b/indra/newview/llagentwearables.cpp
@@ -88,23 +88,22 @@ void wear_and_edit_cb(const LLUUID& inv_item)
 
 void wear_cb(const LLUUID& inv_item)
 {
-	if (inv_item.isNull())
+	if (!inv_item.isNull())
 	{
-		return;
+		LLViewerInventoryItem* item = gInventory.getItem(inv_item);
+		if (item)
+		{
+			LLPermissions perm = item->getPermissions();
+			perm.setMaskNext(LLFloaterPerms::getNextOwnerPerms("Wearables"));
+			perm.setMaskEveryone(LLFloaterPerms::getEveryonePerms("Wearables"));
+			perm.setMaskGroup(LLFloaterPerms::getGroupPerms("Wearables"));
+			item->setPermissions(perm);
+
+			item->updateServer(FALSE);
+			gInventory.updateItem(item);
+			gInventory.notifyObservers();
+		}
 	}
-
-	LLViewerInventoryItem* item = gInventory.getItem(inv_item);
-	if (!item) return;
-
-	LLPermissions perm = item->getPermissions();
-	perm.setMaskNext(LLFloaterPerms::getNextOwnerPerms("Wearables"));
-	perm.setMaskEveryone(LLFloaterPerms::getEveryonePerms("Wearables"));
-	perm.setMaskGroup(LLFloaterPerms::getGroupPerms("Wearables"));
-	item->setPermissions(perm);
-
-	item->updateServer(FALSE);
-	gInventory.updateItem(item);
-	gInventory.notifyObservers();
 }
 
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/indra/newview/llfloaterperms.cpp b/indra/newview/llfloaterperms.cpp
index cc1ff54cb4..0880a5f35a 100755
--- a/indra/newview/llfloaterperms.cpp
+++ b/indra/newview/llfloaterperms.cpp
@@ -119,7 +119,6 @@ const std::string LLFloaterPermsDefault::sCategoryNames[CAT_LAST] =
 	"Wearables"
 };
 
-
 BOOL LLFloaterPermsDefault::postBuild()
 {
 	if(!gSavedSettings.getBOOL("DefaultUploadPermissionsConverted"))
diff --git a/indra/newview/llpanelcontents.cpp b/indra/newview/llpanelcontents.cpp
index 697841ab88..89a9e0dc16 100755
--- a/indra/newview/llpanelcontents.cpp
+++ b/indra/newview/llpanelcontents.cpp
@@ -162,7 +162,6 @@ void LLPanelContents::onClickNewScript(void *userdata)
 		perm.initMasks(
 			PERM_ALL,
 			PERM_ALL,
-			// *NOTE: this does not work, needs server change
 			LLFloaterPerms::getEveryonePerms("Scripts"),
 			LLFloaterPerms::getGroupPerms("Scripts"),
 			PERM_MOVE | LLFloaterPerms::getNextOwnerPerms("Scripts"));
diff --git a/indra/newview/llviewerinventory.cpp b/indra/newview/llviewerinventory.cpp
index 5c41ef52b6..e8ae621e41 100755
--- a/indra/newview/llviewerinventory.cpp
+++ b/indra/newview/llviewerinventory.cpp
@@ -992,66 +992,69 @@ void activate_gesture_cb(const LLUUID& inv_item)
 
 void create_script_cb(const LLUUID& inv_item)
 {
-	if (inv_item.isNull())
-		return;
-
-	LLViewerInventoryItem* item = gInventory.getItem(inv_item);
-	if (!item) return;
-
-	LLPermissions perm = item->getPermissions();
-	perm.setMaskEveryone(LLFloaterPerms::getEveryonePerms("Scripts"));
-	perm.setMaskGroup(LLFloaterPerms::getGroupPerms("Scripts"));
+	if (!inv_item.isNull())
+	{
+		LLViewerInventoryItem* item = gInventory.getItem(inv_item);
+		if (item)
+		{
+			LLPermissions perm = item->getPermissions();
+			perm.setMaskEveryone(LLFloaterPerms::getEveryonePerms("Scripts"));
+			perm.setMaskGroup(LLFloaterPerms::getGroupPerms("Scripts"));
 
-	item->setPermissions(perm);
+			item->setPermissions(perm);
 
-	item->updateServer(FALSE);
-	gInventory.updateItem(item);
-	gInventory.notifyObservers();
+			item->updateServer(FALSE);
+			gInventory.updateItem(item);
+			gInventory.notifyObservers();
+		}
+	}
 }
 
 void create_gesture_cb(const LLUUID& inv_item)
 {
-	if (inv_item.isNull())
-		return;
-
-	LLGestureMgr::instance().activateGesture(inv_item);
+	if (!inv_item.isNull())
+	{
+		LLGestureMgr::instance().activateGesture(inv_item);
 	
-	LLViewerInventoryItem* item = gInventory.getItem(inv_item);
-	if (!item) return;
-
-	LLPermissions perm = item->getPermissions();
-	perm.setMaskEveryone(LLFloaterPerms::getEveryonePerms("Gestures"));
-	perm.setMaskGroup(LLFloaterPerms::getGroupPerms("Gestures"));
+		LLViewerInventoryItem* item = gInventory.getItem(inv_item);
+		if (item)
+		{
+			LLPermissions perm = item->getPermissions();
+			perm.setMaskEveryone(LLFloaterPerms::getEveryonePerms("Gestures"));
+			perm.setMaskGroup(LLFloaterPerms::getGroupPerms("Gestures"));
 
-	item->setPermissions(perm);
+			item->setPermissions(perm);
 
-	item->updateServer(FALSE);
-    gInventory.updateItem(item);
-    gInventory.notifyObservers();
+			item->updateServer(FALSE);
+			gInventory.updateItem(item);
+			gInventory.notifyObservers();
 
-	LLPreviewGesture* preview = LLPreviewGesture::show(inv_item,  LLUUID::null);
-	// Force to be entirely onscreen.
-	gFloaterView->adjustToFitScreen(preview, FALSE);
+			LLPreviewGesture* preview = LLPreviewGesture::show(inv_item,  LLUUID::null);
+			// Force to be entirely onscreen.
+			gFloaterView->adjustToFitScreen(preview, FALSE);
+		}
+	}
 }
 
 
 void create_notecard_cb(const LLUUID& inv_item)
 {
-	if (inv_item.isNull())
-		return;
-	
-	LLViewerInventoryItem* item = gInventory.getItem(inv_item);
-	if (!item) return;
-
-	LLPermissions perm = item->getPermissions();
-	perm.setMaskEveryone(LLFloaterPerms::getEveryonePerms("Notecards"));
-	perm.setMaskGroup(LLFloaterPerms::getGroupPerms("Notecards"));
+	if (!inv_item.isNull())
+		{
+		LLViewerInventoryItem* item = gInventory.getItem(inv_item);
+		if (item)
+		{
+			LLPermissions perm = item->getPermissions();
+			perm.setMaskEveryone(LLFloaterPerms::getEveryonePerms("Notecards"));
+			perm.setMaskGroup(LLFloaterPerms::getGroupPerms("Notecards"));
 
-	item->setPermissions(perm);
+			item->setPermissions(perm);
 
-	item->updateServer(FALSE);
-	gInventory.updateItem(item);
-	gInventory.notifyObservers();
+			item->updateServer(FALSE);
+			gInventory.updateItem(item);
+			gInventory.notifyObservers();
+		}
+	}
 }
 
 LLInventoryCallbackManager gInventoryCallbacks;