Result of svn merge -r57350:57790 svn+ssh://svn/svn/linden/branches/os-patches.001 into release.

18 files changed, 86 insertions, 44 deletions

diff --git a/indra/newview/llcurrencyuimanager.cpp b/indra/newview/llcurrencyuimanager.cpp
index ffea2928c2..96c7f70929 100644
--- a/indra/newview/llcurrencyuimanager.cpp
+++ b/indra/newview/llcurrencyuimanager.cpp
@@ -125,10 +125,10 @@ void LLCurrencyUIManager::Impl::updateCurrencyInfo()
 	}
 	
 	LLXMLRPCValue keywordArgs = LLXMLRPCValue::createStruct();
-	keywordArgs.appendString("agentId",
-		gAgent.getID().getString());
-	keywordArgs.appendString("secureSessionId",
-		gAgent.getSecureSessionID().getString());
+	keywordArgs.appendString("agentId", gAgent.getID().asString());
+	keywordArgs.appendString(
+		"secureSessionId",
+		gAgent.getSecureSessionID().asString());
 	keywordArgs.appendInt("currencyBuy", mUserCurrencyBuy);
 	
 	LLXMLRPCValue params = LLXMLRPCValue::createArray();
@@ -172,10 +172,10 @@ void LLCurrencyUIManager::Impl::startCurrencyBuy(const std::string& password)
 	mCurrencyChanged = false;
 	
 	LLXMLRPCValue keywordArgs = LLXMLRPCValue::createStruct();
-	keywordArgs.appendString("agentId",
-		gAgent.getID().getString());
-	keywordArgs.appendString("secureSessionId",
-		gAgent.getSecureSessionID().getString());
+	keywordArgs.appendString("agentId", gAgent.getID().asString());
+	keywordArgs.appendString(
+		"secureSessionId",
+		gAgent.getSecureSessionID().asString());
 	keywordArgs.appendInt("currencyBuy", mUserCurrencyBuy);
 	keywordArgs.appendInt("estimatedCost", mSiteCurrencyEstimatedCost);
 	keywordArgs.appendString("confirm", mSiteConfirm);
diff --git a/indra/newview/llfloateravatartextures.cpp b/indra/newview/llfloateravatartextures.cpp
index 76e096f0a3..293bf61a0d 100644
--- a/indra/newview/llfloateravatartextures.cpp
+++ b/indra/newview/llfloateravatartextures.cpp
@@ -91,7 +91,7 @@ static void update_texture_ctrl(LLVOAvatar* avatarp,
 	else
 	{
 		ctrl->setImageAssetID(id);
-		ctrl->setToolTip(id.getString());
+		ctrl->setToolTip(id.asString());
 	}
 }
 
@@ -156,7 +156,7 @@ void LLFloaterAvatarTextures::refresh()
 	}
 	else
 	{
-		setTitle(mTitle + ": INVALID AVATAR (" + mID.getString() + ")");
+		setTitle(mTitle + ": INVALID AVATAR (" + mID.asString() + ")");
 	}
 #endif
 }
diff --git a/indra/newview/llfloaterbuyland.cpp b/indra/newview/llfloaterbuyland.cpp
index 189c60132e..c3b2ae70e7 100644
--- a/indra/newview/llfloaterbuyland.cpp
+++ b/indra/newview/llfloaterbuyland.cpp
@@ -406,7 +406,18 @@ void LLFloaterBuyLandUI::updateParcelInfo()
 	mParcelBillableArea =
 		llround(mRegion->getBillableFactor() * mParcelActualArea);
 
-	mParcelSupportedObjects = mParcel->getMaxPrimCapacity();
+ 	mParcelSupportedObjects = llround(
+		mParcel->getMaxPrimCapacity() * mParcel->getParcelPrimBonus()); 
+ 	// Can't have more than region max tasks, regardless of parcel 
+ 	// object bonus factor. 
+ 	LLViewerRegion* region = gParcelMgr->getSelectionRegion(); 
+ 	if(region) 
+ 	{ 
+		S32 max_tasks_per_region = (S32)region->getMaxTasks(); 
+		mParcelSupportedObjects = llmin(
+			mParcelSupportedObjects, max_tasks_per_region); 
+ 	} 
+
 	mParcelSoldWithObjects = mParcel->getSellWithObjects();
 	
 	LLVector3 center = mParcel->getCenterpoint();
@@ -665,9 +676,10 @@ void LLFloaterBuyLandUI::updateWebSiteInfo()
 #endif
 	
 	LLXMLRPCValue keywordArgs = LLXMLRPCValue::createStruct();
-	keywordArgs.appendString("agentId", gAgent.getID().getString());
-	keywordArgs.appendString("secureSessionId",
-		gAgent.getSecureSessionID().getString());
+	keywordArgs.appendString("agentId", gAgent.getID().asString());
+	keywordArgs.appendString(
+		"secureSessionId",
+		gAgent.getSecureSessionID().asString());
 	keywordArgs.appendInt("billableArea", mPreflightAskBillableArea);
 	keywordArgs.appendInt("currencyBuy", mPreflightAskCurrencyBuy);
 	
@@ -752,9 +764,10 @@ void LLFloaterBuyLandUI::runWebSitePrep(const std::string& password)
 	}
 	
 	LLXMLRPCValue keywordArgs = LLXMLRPCValue::createStruct();
-	keywordArgs.appendString("agentId", gAgent.getID().getString());
-	keywordArgs.appendString("secureSessionId",
-		gAgent.getSecureSessionID().getString());
+	keywordArgs.appendString("agentId", gAgent.getID().asString());
+	keywordArgs.appendString(
+		"secureSessionId",
+		gAgent.getSecureSessionID().asString());
 	keywordArgs.appendString("levelId", newLevel);
 	keywordArgs.appendInt("billableArea",
 		mIsForGroup ? 0 : mParcelBillableArea);
diff --git a/indra/newview/llfloaterfriends.cpp b/indra/newview/llfloaterfriends.cpp
index a910e1a12a..6f31cbb3a0 100644
--- a/indra/newview/llfloaterfriends.cpp
+++ b/indra/newview/llfloaterfriends.cpp
@@ -518,8 +518,7 @@ void LLFloaterFriends::requestFriendship(const LLUUID& target_id, const LLString
 {
 	// HACK: folder id stored as "message"
 	LLUUID calling_card_folder_id = gInventory.findCategoryUUIDForType(LLAssetType::AT_CALLINGCARD);
-	std::string message = calling_card_folder_id.getString();
-
+	std::string message = calling_card_folder_id.asString();
 	send_improved_im(target_id,
 					 target_name.c_str(),
 					 message.c_str(),
diff --git a/indra/newview/llfloatergodtools.cpp b/indra/newview/llfloatergodtools.cpp
index 45cf356a52..7096f5dbf6 100644
--- a/indra/newview/llfloatergodtools.cpp
+++ b/indra/newview/llfloatergodtools.cpp
@@ -971,7 +971,7 @@ void LLPanelGridTools::flushMapVisibilityCachesConfirm(S32 option, void* data)
 	msg->addString("Method", "refreshmapvisibility");
 	msg->addUUID("Invoice", LLUUID::null);
 	msg->nextBlock("ParamList");
-	msg->addString("Parameter", gAgent.getID().getString());
+	msg->addString("Parameter", gAgent.getID().asString());
 	gAgent.sendReliableMessage();
 }
 
diff --git a/indra/newview/llfloaterregioninfo.cpp b/indra/newview/llfloaterregioninfo.cpp
index 55b3ee185b..2857339db3 100644
--- a/indra/newview/llfloaterregioninfo.cpp
+++ b/indra/newview/llfloaterregioninfo.cpp
@@ -2627,7 +2627,7 @@ void LLPanelEstateCovenant::sendChangeCovenantID(const LLUUID &asset_id)
 		msg->addUUID("Invoice", LLFloaterRegionInfo::getLastInvoice());
 
 		msg->nextBlock("ParamList");
-		msg->addString("Parameter", getCovenantID().getString().c_str());
+		msg->addString("Parameter", getCovenantID().asString());
 		gAgent.sendReliableMessage();
 	}
 }
diff --git a/indra/newview/llfloatertopobjects.cpp b/indra/newview/llfloatertopobjects.cpp
index 8e24864880..90490f6f9b 100644
--- a/indra/newview/llfloatertopobjects.cpp
+++ b/indra/newview/llfloatertopobjects.cpp
@@ -231,7 +231,7 @@ void LLFloaterTopObjects::updateSelectionInfo()
 	LLUUID object_id = list->getCurrentID();
 	if (object_id.isNull()) return;
 
-	LLString object_id_string = object_id.getString();
+	std::string object_id_string = object_id.asString();
 
 	childSetValue("id_editor", LLSD(object_id_string));
 	childSetValue("object_name_editor", list->getFirstSelected()->getColumn(1)->getText());
diff --git a/indra/newview/llpanelclassified.cpp b/indra/newview/llpanelclassified.cpp
index 74600a262a..3cd4082829 100644
--- a/indra/newview/llpanelclassified.cpp
+++ b/indra/newview/llpanelclassified.cpp
@@ -785,7 +785,7 @@ void LLPanelClassified::sendClassifiedClickMessage(const char* type)
 	// You're allowed to click on your own ads to reassure yourself
 	// that the system is working.
 	std::vector<std::string> strings;
-	strings.push_back(mClassifiedID.getString());
+	strings.push_back(mClassifiedID.asString());
 	strings.push_back(type);
 	LLUUID no_invoice;
 	send_generic_message("classifiedclick", strings, no_invoice);
diff --git a/indra/newview/llpanelgroupgeneral.cpp b/indra/newview/llpanelgroupgeneral.cpp
index 06a7598918..10db68d448 100644
--- a/indra/newview/llpanelgroupgeneral.cpp
+++ b/indra/newview/llpanelgroupgeneral.cpp
@@ -433,7 +433,7 @@ bool LLPanelGroupGeneral::apply(LLString& mesg)
 	if (!gdatap)
 	{
 		mesg = "No group data found for group ";
-		mesg.append(mGroupID.getString());
+		mesg.append(mGroupID.asString());
 		return false;
 	}
 
diff --git a/indra/newview/llpanelgroupnotices.cpp b/indra/newview/llpanelgroupnotices.cpp
index 1cef8153b8..9f2d9cf909 100644
--- a/indra/newview/llpanelgroupnotices.cpp
+++ b/indra/newview/llpanelgroupnotices.cpp
@@ -503,7 +503,7 @@ void LLPanelGroupNotices::onSelectNotice(LLUICtrl* ctrl, void* data)
 	msg->addUUID("GroupNoticeID",item->getUUID());
 	gAgent.sendReliableMessage();
 
-	lldebugs << "Item " << item->getUUID().getString().c_str() << " selected." << llendl;
+	lldebugs << "Item " << item->getUUID() << " selected." << llendl;
 }
 
 void LLPanelGroupNotices::showNotice(const char* subject,
diff --git a/indra/newview/llpanelpick.cpp b/indra/newview/llpanelpick.cpp
index 6c5dcc1f45..ab2a298a06 100644
--- a/indra/newview/llpanelpick.cpp
+++ b/indra/newview/llpanelpick.cpp
@@ -488,7 +488,7 @@ void LLPanelPick::onCommitAny(LLUICtrl* ctrl, void* data)
 		else
 		{*/
 			LLTabContainerVertical* tab = (LLTabContainerVertical*)self->getParent();
-			tab->setCurrentTabName(self->mNameEditor->getText());
+			if(tab) tab->setCurrentTabName(self->mNameEditor->getText());
 		//}
 	}
 }
diff --git a/indra/newview/llselectmgr.cpp b/indra/newview/llselectmgr.cpp
index 50f6d115bd..3ae4ba9107 100644
--- a/indra/newview/llselectmgr.cpp
+++ b/indra/newview/llselectmgr.cpp
@@ -6343,13 +6343,17 @@ void LLSelectNodeList::addNodeAtEnd(LLSelectNode *nodep)
 
 void LLSelectNodeList::removeNode(LLSelectNode *nodep)
 {
-	std::list<LLSelectNode*>::iterator iter;
-	for (iter = begin(); iter != end(); ++iter)
+	std::list<LLSelectNode*>::iterator iter = begin();
+	while(iter != end())
 	{
 		if ((*iter) == nodep)
 		{
 			mSelectNodeMap.erase(nodep->getObject());
-			erase(iter++);
+			iter = erase(iter);
+		}
+		else
+		{
+			++iter;
 		}
 	}
 }
diff --git a/indra/newview/lltexturectrl.cpp b/indra/newview/lltexturectrl.cpp
index be33de3cca..5eae8c2ff1 100644
--- a/indra/newview/lltexturectrl.cpp
+++ b/indra/newview/lltexturectrl.cpp
@@ -319,7 +319,8 @@ void LLFloaterTexturePicker::updateImageStats()
 		}
 		if (gAgent.isGodlike())
 		{
-			LLString tstring = "Pick: " + mTexturep->getID().getString();
+			LLString tstring = "Pick: ";
+			tstring.append(mTexturep->getID().asString());
 			setTitle(tstring);
 		}
 	}
diff --git a/indra/newview/lltooldraganddrop.cpp b/indra/newview/lltooldraganddrop.cpp
index ea1284117d..94b549b8e6 100644
--- a/indra/newview/lltooldraganddrop.cpp
+++ b/indra/newview/lltooldraganddrop.cpp
@@ -582,6 +582,7 @@ LLToolDragAndDrop::LLToolDragAndDrop()
 	 LLTool("draganddrop", NULL),
 	 mDragStartX(0),
 	 mDragStartY(0),
+	 mSource(SOURCE_AGENT),
 	 mCursor(UI_CURSOR_NO),
 	 mLastAccept(ACCEPT_NO),
 	 mDrop(FALSE),
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index 49578b186d..838bf68f3d 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -2124,7 +2124,7 @@ class LLAvatarDebug : public view_listener_t
 		}
 		llinfos << "Dumping temporary asset data to simulator logs for avatar " << avatar->getID() << llendl;
 		std::vector<std::string> strings;
-		strings.push_back( avatar->getID().getString() );
+		strings.push_back(avatar->getID().asString());
 		LLUUID invoice;
 		send_generic_message("dumptempassetdata", strings, invoice);
 		LLFloaterAvatarTextures::show( avatar->getID() );
@@ -7431,7 +7431,7 @@ void handle_selected_texture_info(void*)
 			std::string image_id_string;
 			if (gAgent.isGodlike())
 			{
-				image_id_string = image_id.getString() + " ";
+				image_id_string = image_id.asString() + " ";
 			}
 			msg = llformat("%s%dx%d %s on face ",
 								image_id_string.c_str(),
@@ -8246,7 +8246,9 @@ BOOL LLViewerMenuHolderGL::hideMenus()
 	if (handled)
 	{
 		gSelectMgr->deselectTransient();
-		if (!gFloaterTools->getVisible() && !LLFloaterLand::floaterVisible())
+		if(!gFloaterTools->getVisible()
+		   && !LLFloaterLand::floaterVisible()
+		   && !LLFloaterBuyLand::isOpen()) 
 		{
 			gParcelMgr->deselectLand();	
 		}
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index 71e3b5dded..f402fc320b 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -1621,7 +1621,17 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
 		}
 		break;
 	case IM_BUSY_AUTO_RESPONSE:
-		gIMView->addMessage(session_id, from_id, name, message);
+		// fix for JIRA issue VWR-20 submitted 13-JAN-2007 - Paul Churchill
+		if (is_muted)
+		{
+			lldebugs << "Ignoring busy response from " << from_id << llendl;
+			return;
+		}
+		else
+		{
+			// original code resumes
+			gIMView->addMessage(session_id, from_id, name, message);
+		}
 		break;
 		
 	case IM_LURE_USER:
@@ -1722,7 +1732,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
 			LLAvatarTracker::formFriendship(from_id);
 			
 			std::vector<std::string> strings;
-			strings.push_back( from_id.getString() );
+			strings.push_back(from_id.asString());
 			send_generic_message("requestonlinenotification", strings);
 			
 			args["[NAME]"] = name;
diff --git a/indra/newview/llviewerparcelmgr.cpp b/indra/newview/llviewerparcelmgr.cpp
index a31708a621..81576bd5fc 100644
--- a/indra/newview/llviewerparcelmgr.cpp
+++ b/indra/newview/llviewerparcelmgr.cpp
@@ -698,9 +698,10 @@ BOOL LLViewerParcelMgr::agentCanBuild() const
 {
 	if (mAgentParcel)
 	{
-		return gAgent.isGodlike()
-			|| (mAgentParcel->getOwnerID() == gAgent.getID())
-			|| (mAgentParcel->getAllowModify());
+		return (gAgent.isGodlike()
+				|| (mAgentParcel->allowModifyBy(
+						gAgent.getID(),
+						gAgent.getGroupID())));
 	}
 	else
 	{
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index efcd36af0a..b21df05afe 100644
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -2988,14 +2988,24 @@ void LLVOAvatar::updateCharacter(LLAgent &agent)
 			{
 				if (motionp->getMinPixelArea() < getPixelArea())
 				{
-					char output[256];		/* Flawfinder: ignore */
+					char output[MAX_STRING];	/* Flawfinder: ignore */
 					if (motionp->getName().empty())
 					{
-						snprintf(output, sizeof(output), "%s - %d", motionp->getID().getString().c_str(), (U32)motionp->getPriority());		/* Flawfinder: ignore */
+						snprintf( /* Flawfinder: ignore */
+							output,
+							MAX_STRING,
+							"%s - %d",
+							motionp->getID().asString().c_str(),
+							(U32)motionp->getPriority());
 					}
 					else
 					{
-						snprintf(output, sizeof(output), "%s - %d", motionp->getName().c_str(), (U32)motionp->getPriority());		/* Flawfinder: ignore */
+						snprintf(	/* Flawfinder: ignore */
+							output,
+							MAX_STRING,
+							"%s - %d",
+							motionp->getName().c_str(),
+							(U32)motionp->getPriority());
 					}
 					addDebugText(output);
 				}
@@ -3948,9 +3958,10 @@ void LLVOAvatar::updateTextures(LLAgent &agent)
 				&& imagep->getID() != IMG_DEFAULT_AVATAR
 				&& !imagep->getTargetHost().isOk())
 			{
-				llwarns << "LLVOAvatar::updateTextures No host for texture " << imagep->getID() 
-						<< " for avatar " << (mIsSelf ? "<myself>" : getID().getString()) 
-						<< " on host " << getRegion()->getHost() << llendl;
+				llwarns << "LLVOAvatar::updateTextures No host for texture "
+					<< imagep->getID() << " for avatar "
+					<< (mIsSelf ? "<myself>" : getID().asString().c_str()) 
+					<< " on host " << getRegion()->getHost() << llendl;
 			}
 			
 			switch( i )