STORM-68 Removed debugging PERM_ALL that was causing upload trouble and removed 3 obsolete debug settings

6 files changed, 12 insertions, 43 deletions

diff --git a/indra/llinventory/llinventory.cpp b/indra/llinventory/llinventory.cpp
index 4e5a328c54..fbf23bc3f0 100644
--- a/indra/llinventory/llinventory.cpp
+++ b/indra/llinventory/llinventory.cpp
@@ -303,11 +303,6 @@ LLInventoryItem::LLInventoryItem(const LLUUID& uuid,
 	LLStringUtil::replaceNonstandardASCII(mDescription, ' ');
 	LLStringUtil::replaceChar(mDescription, '|', ' ');
 	mPermissions.initMasks(inv_type);
-//	if (LLInventoryType::IT_LSL == inv_type)
-//	{
-//		mPermissions.setMaskNext(permissions.getMaskNextOwner());
-		mPermissions.setMaskNext(PERM_ALL);
-//	}
 }
 
 LLInventoryItem::LLInventoryItem() :
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index b3ed917574..7a3c1df0bc 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -6043,39 +6043,6 @@
       <key>Value</key>
       <integer>130</integer>
     </map>
-    <key>NextOwnerCopy</key>
-    <map>
-      <key>Comment</key>
-      <string>Newly created objects can be copied by next owner</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>Boolean</string>
-      <key>Value</key>
-      <integer>0</integer>
-    </map>
-    <key>NextOwnerModify</key>
-    <map>
-      <key>Comment</key>
-      <string>Newly created objects can be modified by next owner</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>Boolean</string>
-      <key>Value</key>
-      <integer>0</integer>
-    </map>
-    <key>NextOwnerTransfer</key>
-    <map>
-      <key>Comment</key>
-      <string>Newly created objects can be resold or given away by next owner</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>Boolean</string>
-      <key>Value</key>
-      <integer>1</integer>
-    </map>
     <key>NewCacheLocation</key>
     <map>
       <key>Comment</key>
diff --git a/indra/newview/llassetuploadresponders.cpp b/indra/newview/llassetuploadresponders.cpp
index 65bfc990d1..c4a2d8fca5 100644
--- a/indra/newview/llassetuploadresponders.cpp
+++ b/indra/newview/llassetuploadresponders.cpp
@@ -151,7 +151,7 @@ void on_new_single_inventory_upload_complete(
 			LLSaleInfo::DEFAULT,
 			inventory_item_flags,
 			creation_date_now);
-
+llwarns << "DBG -------------" << llendl;
 		gInventory.updateItem(item);
 		gInventory.notifyObservers();
 		success = true;
diff --git a/indra/newview/llfloaternamedesc.cpp b/indra/newview/llfloaternamedesc.cpp
index eefc352287..97671a8614 100644
--- a/indra/newview/llfloaternamedesc.cpp
+++ b/indra/newview/llfloaternamedesc.cpp
@@ -45,6 +45,7 @@
 #include "lluictrlfactory.h"
 #include "llstring.h"
 #include "lleconomy.h"
+#include "llpermissions.h"
 
 // linden includes
 #include "llassetstorage.h"
@@ -167,11 +168,16 @@ void LLFloaterNameDesc::onBtnOK( )
 	S32 expected_upload_cost = LLGlobalEconomy::Singleton::getInstance()->getPriceUpload(); // kinda hack - assumes that unsubclassed LLFloaterNameDesc is only used for uploading chargeable assets, which it is right now (it's only used unsubclassed for the sound upload dialog, and THAT should be a subclass).
 	void *nruserdata = NULL;
 	std::string display_name = LLStringUtil::null;
+		LLPermissions perm;
+		perm.setMaskNext(PERM_COPY);
 	upload_new_resource(mFilenameAndPath, // file
 			    getChild<LLUICtrl>("name_form")->getValue().asString(), 
 			    getChild<LLUICtrl>("description_form")->getValue().asString(), 
 			    0, LLFolderType::FT_NONE, LLInventoryType::IT_NONE,
-			    LLFloaterPerms::getNextOwnerPerms("Uploads"), LLFloaterPerms::getGroupPerms("Uploads"), LLFloaterPerms::getEveryonePerms("Uploads"),
+perm.getMaskNextOwner(),
+//			    LLFloaterPerms::getNextOwnerPerms("Uploads"),
+				LLFloaterPerms::getGroupPerms("Uploads"),
+				LLFloaterPerms::getEveryonePerms("Uploads"),
 			    display_name, callback, expected_upload_cost, nruserdata);
 	closeFloater(false);
 }
diff --git a/indra/newview/llfloaterperms.cpp b/indra/newview/llfloaterperms.cpp
index 3853dd0ef6..ede17d937e 100644
--- a/indra/newview/llfloaterperms.cpp
+++ b/indra/newview/llfloaterperms.cpp
@@ -59,6 +59,8 @@ U32 LLFloaterPerms::getEveryonePerms(std::string prefix)
 //static 
 U32 LLFloaterPerms::getNextOwnerPerms(std::string prefix)
 {
+llwarns << "DBG prefix=" << prefix << llendl;
+
 	U32 flags = PERM_MOVE;
 	if ( gSavedSettings.getBOOL(prefix+"NextOwnerCopy") )
 	{
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp
index 98856d125f..a494e934b0 100644
--- a/indra/newview/llviewerobject.cpp
+++ b/indra/newview/llviewerobject.cpp
@@ -2577,7 +2577,6 @@ void LLViewerObject::saveScript(
 	perm.setMaskNext(LLFloaterPerms::getNextOwnerPerms("Scripts"));
 	perm.setMaskEveryone(LLFloaterPerms::getEveryonePerms("Scripts"));
 	perm.setMaskGroup(LLFloaterPerms::getGroupPerms("Scripts"));
-	perm.setMaskNext(PERM_ALL);
 
 	LLPointer<LLViewerInventoryItem> task_item =
 		new LLViewerInventoryItem(item->getUUID(), mID, perm,
@@ -2602,10 +2601,10 @@ void LLViewerObject::saveScript(
 	task_item->packMessage(msg);
 	msg->sendReliable(mRegionp->getHost());
 
-	task_item->setPermissions(perm);
-
 	// do the internal logic
 	doUpdateInventory(task_item, TASK_INVENTORY_ITEM_KEY, is_new);
+llwarns << "DBG is_new:" << is_new << llendl;
+	task_item->setPermissions(perm);
 }
 
 void LLViewerObject::moveInventory(const LLUUID& folder_id,