QAR-1177 maint-viewer-12 + uploadfees-viewer combo mergeme

svn merge -r108355:109316
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/maint-viewer-12-uploadfees-qa108314

Whew.

1 files changed, 3 insertions, 4 deletions

diff --git a/indra/newview/llinventorymodel.cpp b/indra/newview/llinventorymodel.cpp
index 48d9a8a76b..f98a3f9ee5 100644
--- a/indra/newview/llinventorymodel.cpp
+++ b/indra/newview/llinventorymodel.cpp
@@ -1067,7 +1067,7 @@ void  LLInventoryModel::fetchInventoryResponder::result(const LLSD& content)
 	S32 count = content["items"].size();
 	bool all_one_folder = true;
 	LLUUID folder_id;
-	// Does this loop ever execute more than once? -Gigs
+	// Does this loop ever execute more than once?
 	for(S32 i = 0; i < count; ++i)
 	{
 		LLPointer<LLViewerInventoryItem> titem = new LLViewerInventoryItem;
@@ -2645,7 +2645,7 @@ void LLInventoryModel::processFetchInventoryReply(LLMessageSystem* msg, void**)
 
 bool LLInventoryModel::messageUpdateCore(LLMessageSystem* msg, bool account)
 {
-	//make sure our added inventory observer is active -Gigs
+	//make sure our added inventory observer is active
 	start_new_inventory_observer();
 
 	LLUUID agent_id;
@@ -2661,7 +2661,7 @@ bool LLInventoryModel::messageUpdateCore(LLMessageSystem* msg, bool account)
 	S32 count = msg->getNumberOfBlocksFast(_PREHASH_InventoryData);
 	bool all_one_folder = true;
 	LLUUID folder_id;
-	// Does this loop ever execute more than once? -Gigs
+	// Does this loop ever execute more than once?
 	for(S32 i = 0; i < count; ++i)
 	{
 		LLPointer<LLViewerInventoryItem> titem = new LLViewerInventoryItem;
@@ -3791,7 +3791,6 @@ void LLInventoryAddedObserver::changed(U32 mask)
 
 	// *HACK: If this was in response to a packet off
 	// the network, figure out which item was updated.
-	// Code from Gigs Taggert, sin allowed by JC.
 	LLMessageSystem* msg = gMessageSystem;
 
 	std::string msg_name;