merge release@57486 release-candidate@57503

10 files changed, 74 insertions, 84 deletions

diff --git a/indra/newview/English.lproj/InfoPlist.strings b/indra/newview/English.lproj/InfoPlist.strings
index 2f68a020ca..6ef64e4b4b 100644
--- a/indra/newview/English.lproj/InfoPlist.strings
+++ b/indra/newview/English.lproj/InfoPlist.strings
@@ -1,5 +1,5 @@
 /* Localized versions of Info.plist keys */
 
 CFBundleName = "Second Life";
-CFBundleShortVersionString = "Second Life version 1.13.2.15";
-CFBundleGetInfoString = "Second Life version 1.13.2.15, Copyright 2004-2006 Linden Research, Inc.";
+CFBundleShortVersionString = "Second Life version 1.13.3.2";
+CFBundleGetInfoString = "Second Life version 1.13.3.2, Copyright 2004-2006 Linden Research, Inc.";
diff --git a/indra/newview/Info-SecondLife.plist b/indra/newview/Info-SecondLife.plist
index 3e6c65e953..6e1de8bb07 100644
--- a/indra/newview/Info-SecondLife.plist
+++ b/indra/newview/Info-SecondLife.plist
@@ -32,7 +32,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.13.2.15</string>
+	<string>1.13.3.2</string>
 	<key>CSResourcesFileMapped</key>
 	<true/>
 </dict>
diff --git a/indra/newview/llfloaterland.cpp b/indra/newview/llfloaterland.cpp
index 3b4c7c2f59..be06154c29 100644
--- a/indra/newview/llfloaterland.cpp
+++ b/indra/newview/llfloaterland.cpp
@@ -999,8 +999,8 @@ void LLPanelLandGeneral::onCommitAny(LLUICtrl *ctrl, void *userdata)
 	}
 
 	// Extract data from UI
-	std::string name		= panelp->mEditName->getText();
-	std::string desc		= panelp->mEditDesc->getText();
+	std::string name = panelp->mEditName->getText();
+	std::string desc = panelp->mEditDesc->getText();
 
 	// Valid data from UI
 
@@ -1104,7 +1104,7 @@ BOOL LLPanelLandObjects::postBuild()
 
 	mCleanOtherObjectsTime = LLUICtrlFactory::getLineEditorByName(this, "clean other time");
 	mCleanOtherObjectsTime->setFocusLostCallback(onLostFocus);	
-	childSetPrevalidate("clean other time", LLLineEditor::prevalidatePrintableNotPipe);
+	childSetPrevalidate("clean other time", LLLineEditor::prevalidateNonNegativeS32);
 	childSetUserData("clean other time", this);
 	
 	mOwnerListText = LLUICtrlFactory::getTextBoxByName(this, "Object Owners:");
diff --git a/indra/newview/llfloaterproperties.cpp b/indra/newview/llfloaterproperties.cpp
index 4311a899c4..76a387556e 100644
--- a/indra/newview/llfloaterproperties.cpp
+++ b/indra/newview/llfloaterproperties.cpp
@@ -145,6 +145,7 @@ LLFloaterProperties::LLFloaterProperties(const std::string& name, const LLRect&
 	childSetPrevalidate("LabelItemName",&LLLineEditor::prevalidatePrintableNotPipe);
 	childSetCommitCallback("LabelItemName",onCommitName,this);
 	childSetPrevalidate("LabelItemDesc",&LLLineEditor::prevalidatePrintableNotPipe);
+	childSetCommitCallback("LabelItemDesc", onCommitDescription, this);
 	// Creator information
 	childSetAction("BtnCreator",onClickCreator,this);
 	// owner information
diff --git a/indra/newview/llhudeffect.cpp b/indra/newview/llhudeffect.cpp
index 4f80fffb01..8fbfcb65e7 100644
--- a/indra/newview/llhudeffect.cpp
+++ b/indra/newview/llhudeffect.cpp
@@ -38,6 +38,7 @@ LLHUDEffect::~LLHUDEffect()
 void LLHUDEffect::packData(LLMessageSystem *mesgsys)
 {
 	mesgsys->addUUIDFast(_PREHASH_ID, mID);
+	mesgsys->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
 	mesgsys->addU8Fast(_PREHASH_Type, mType);
 	mesgsys->addF32Fast(_PREHASH_Duration, mDuration);
 	mesgsys->addBinaryData(_PREHASH_Color, mColor.mV, 4);
diff --git a/indra/newview/llhudmanager.cpp b/indra/newview/llhudmanager.cpp
index 40e140253e..31e6318d25 100644
--- a/indra/newview/llhudmanager.cpp
+++ b/indra/newview/llhudmanager.cpp
@@ -176,9 +176,13 @@ void LLHUDManager::sendEffects()
 		}
 		if (hep->getNeedsSendToSim() && hep->getOriginatedHere())
 		{
-			gMessageSystem->newMessageFast(_PREHASH_ViewerEffect);
-			gMessageSystem->nextBlockFast(_PREHASH_Effect);
-			hep->packData(gMessageSystem);
+			LLMessageSystem* msg = gMessageSystem;
+			msg->newMessageFast(_PREHASH_ViewerEffect);
+			msg->nextBlockFast(_PREHASH_AgentData);
+			msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
+			msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
+			msg->nextBlockFast(_PREHASH_Effect);
+			hep->packData(msg);
 			hep->setNeedsSendToSim(FALSE);
 			gAgent.sendMessage();
 		}
diff --git a/indra/newview/llpanelavatar.cpp b/indra/newview/llpanelavatar.cpp
index 9b1a6caf0e..615086e7d4 100644
--- a/indra/newview/llpanelavatar.cpp
+++ b/indra/newview/llpanelavatar.cpp
@@ -400,8 +400,11 @@ BOOL LLPanelAvatarSecondLife::postBuild(void)
 	childSetVisible("allow_publish",LLPanelAvatar::sAllowFirstLife);
 	childSetVisible("?",LLPanelAvatar::sAllowFirstLife);
 
-	childSetVisible("online_unknown",TRUE);
 	childSetVisible("online_yes",FALSE);
+
+	// These are cruft but may still exist in some xml files
+	// TODO: remove the following 2 lines once translators grab these changes
+	childSetVisible("online_unknown",FALSE);
 	childSetVisible("online_no",FALSE);
 
 	childSetAction("Show on Map", LLPanelAvatar::onClickTrack, mPanelAvatar);
@@ -1279,6 +1282,19 @@ void LLPanelAvatar::setAvatar(LLViewerObject *avatarp)
 	setAvatarID(avatarp->getID(), name, ONLINE_STATUS_YES);
 }
 
+void LLPanelAvatar::setOnlineStatus(EOnlineStatus online_status)
+{
+	// Online status NO could be because they are hidden
+	// If they are a friend, we may know the truth!
+	if ((ONLINE_STATUS_YES != online_status)
+		&& mIsFriend
+		&& (LLAvatarTracker::instance().isBuddyOnline( mAvatarID )))
+	{
+		online_status = ONLINE_STATUS_YES;
+	}
+
+	mPanelSecondLife->childSetVisible("online_yes", (online_status == ONLINE_STATUS_YES));
+}
 
 void LLPanelAvatar::setAvatarID(const LLUUID &avatar_id, const LLString &name,
 								EOnlineStatus online_status)
@@ -1295,50 +1311,8 @@ void LLPanelAvatar::setAvatarID(const LLUUID &avatar_id, const LLString &name,
 	// Determine if we have their calling card.
 	mIsFriend = is_agent_friend(mAvatarID); 
 
-	if (ONLINE_STATUS_UNKNOWN == online_status)
-	{
-		// Determine if we know that they are online.  If we can see them,
-		// we know they're online.  Likewise, if we have a calling card,
-		// we know.  Otherwise we don't.
-		LLViewerObject* object = gObjectList.findObject( mAvatarID );
-		if (object && !object->isDead())
-		{
-			online_status = ONLINE_STATUS_YES;
-		}
-		else if (mIsFriend)
-		{
-			if (LLAvatarTracker::instance().isBuddyOnline( mAvatarID ))
-			{
-				online_status = ONLINE_STATUS_YES;
-			}
-			else
-			{
-				online_status = ONLINE_STATUS_NO;
-			}
-		}
-		else
-		{
-			// Don't actually know if they are online.
-		}
-	}
-
-	mPanelSecondLife->childSetVisible("online_unknown",FALSE);
-	mPanelSecondLife->childSetVisible("online_yes",FALSE);
-	mPanelSecondLife->childSetVisible("online_no",FALSE);
-
-	switch(online_status)
-	{
-	  case ONLINE_STATUS_YES:
-		mPanelSecondLife->childSetVisible("online_yes",TRUE);
-		break;
-	  case ONLINE_STATUS_NO:
-		mPanelSecondLife->childSetVisible("online_no",TRUE);
-		break;
-	  case ONLINE_STATUS_UNKNOWN:
-	  default:
-		mPanelSecondLife->childSetVisible("online_unknown",TRUE);
-		break;
-	}
+	// setOnlineStatus uses mIsFriend
+	setOnlineStatus(online_status);
 	
 	BOOL own_avatar = (mAvatarID == gAgent.getID() );
 
@@ -1736,8 +1710,11 @@ void LLPanelAvatar::processAvatarPropertiesReply(LLMessageSystem *msg, void**)
 	//BOOL	mature = FALSE;
 	BOOL	identified = FALSE;
 	BOOL	transacted = FALSE;
+	BOOL	online = FALSE;
 	char	profile_url[DB_USER_PROFILE_URL_BUF_SIZE];
 
+	U32		flags = 0x0;
+
 	//llinfos << "properties packet size " << msg->getReceiveSize() << llendl;
 
 	msg->getUUIDFast(_PREHASH_AgentData, _PREHASH_AgentID, agent_id);
@@ -1757,7 +1734,6 @@ void LLPanelAvatar::processAvatarPropertiesReply(LLMessageSystem *msg, void**)
 		{
 			self->childSetEnabled("Rate...",TRUE);
 		}
-		lldebugs << "!!!!!!!!!!!!!!!!!!!!!!Enabling drop target" << llendl;
 		self->childSetEnabled("drop target",TRUE);
 
 		self->mHaveProperties = TRUE;
@@ -1769,9 +1745,17 @@ void LLPanelAvatar::processAvatarPropertiesReply(LLMessageSystem *msg, void**)
 		msg->getStringFast(_PREHASH_PropertiesData, _PREHASH_AboutText,	DB_USER_ABOUT_BUF_SIZE,		about_text );
 		msg->getStringFast(_PREHASH_PropertiesData, _PREHASH_FLAboutText,	DB_USER_FL_ABOUT_BUF_SIZE,		fl_about_text );
 		msg->getStringFast(_PREHASH_PropertiesData, _PREHASH_BornOn, DB_BORN_BUF_SIZE, born_on);
-		msg->getBOOLFast(_PREHASH_PropertiesData, _PREHASH_Identified,  identified);
-		msg->getBOOLFast(_PREHASH_PropertiesData, _PREHASH_Transacted,  transacted);
 		msg->getString("PropertiesData","ProfileURL", DB_USER_PROFILE_URL_BUF_SIZE, profile_url);
+		msg->getU32Fast(_PREHASH_PropertiesData, _PREHASH_Flags, flags);
+		
+		identified = (flags & AVATAR_IDENTIFIED);
+		transacted = (flags & AVATAR_TRANSACTED);
+		allow_publish = (flags & AVATAR_ALLOW_PUBLISH);
+		online = (flags & AVATAR_ONLINE);
+		
+		EOnlineStatus online_status = (online) ? ONLINE_STATUS_YES : ONLINE_STATUS_NO;
+
+		self->setOnlineStatus(online_status);
 
 		self->mPanelWeb->setWebURL(std::string(profile_url));
 		U8 caption_index = 0;
@@ -1849,7 +1833,6 @@ void LLPanelAvatar::processAvatarPropertiesReply(LLMessageSystem *msg, void**)
 			{
 				image_ctrl->setImageAssetID(fl_image_id);
 			}
-			msg->getBOOL("PropertiesData", "AllowPublish", allow_publish);
 
 			self->mPanelSecondLife->childSetValue("allow_publish", allow_publish);
 
diff --git a/indra/newview/llpanelavatar.h b/indra/newview/llpanelavatar.h
index 0cdcdf938b..713750ad06 100644
--- a/indra/newview/llpanelavatar.h
+++ b/indra/newview/llpanelavatar.h
@@ -36,7 +36,6 @@ class LLWebBrowserCtrl;
 
 enum EOnlineStatus
 {
-	ONLINE_STATUS_UNKNOWN = -1,
 	ONLINE_STATUS_NO      = 0,
 	ONLINE_STATUS_YES     = 1
 };
@@ -243,6 +242,8 @@ public:
 	// Pass one of the ONLINE_STATUS_foo constants above.
 	void setAvatarID(const LLUUID &avatar_id, const LLString &name, EOnlineStatus online_status);
 
+	void setOnlineStatus(EOnlineStatus online_status);
+
 	const LLUUID& getAvatarID() const { return mAvatarID; }
 
 	void disableRate();
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index b2889f961a..05e3159864 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -562,21 +562,21 @@ void init_menus()
 	// flash when an item is triggered (the flash occurs in the holder)
 	gViewerWindow->getRootView()->addChild(gMenuHolder);
 
-		gMenuHolder->childSetLabelArg("Upload Image", "[COST]", "10");
-		gMenuHolder->childSetLabelArg("Upload Sound", "[COST]", "10");
-		gMenuHolder->childSetLabelArg("Upload Animation", "[COST]", "10");
-		gMenuHolder->childSetLabelArg("Bulk Upload", "[COST]", "10");
+	gMenuHolder->childSetLabelArg("Upload Image", "[COST]", "10");
+	gMenuHolder->childSetLabelArg("Upload Sound", "[COST]", "10");
+	gMenuHolder->childSetLabelArg("Upload Animation", "[COST]", "10");
+	gMenuHolder->childSetLabelArg("Bulk Upload", "[COST]", "10");
 
-		gAFKMenu = (LLMenuItemCallGL*)gMenuBarView->getChildByName("Set Away", TRUE);
-		gBusyMenu = (LLMenuItemCallGL*)gMenuBarView->getChildByName("Set Busy", TRUE);
-		gAttachSubMenu = gMenuBarView->getChildMenuByName("Attach Object", TRUE);
-		gDetachSubMenu = gMenuBarView->getChildMenuByName("Detach Object", TRUE);
+	gAFKMenu = (LLMenuItemCallGL*)gMenuBarView->getChildByName("Set Away", TRUE);
+	gBusyMenu = (LLMenuItemCallGL*)gMenuBarView->getChildByName("Set Busy", TRUE);
+	gAttachSubMenu = gMenuBarView->getChildMenuByName("Attach Object", TRUE);
+	gDetachSubMenu = gMenuBarView->getChildMenuByName("Detach Object", TRUE);
 
-		if (gAgent.mAccess < SIM_ACCESS_MATURE)
-		{
-			gMenuBarView->getChildByName("Menu Underpants", TRUE)->setVisible(FALSE);
-			gMenuBarView->getChildByName("Menu Undershirt", TRUE)->setVisible(FALSE);
-		}
+	if (gAgent.mAccess < SIM_ACCESS_MATURE)
+	{
+		gMenuBarView->getChildByName("Menu Underpants", TRUE)->setVisible(FALSE);
+		gMenuBarView->getChildByName("Menu Undershirt", TRUE)->setVisible(FALSE);
+	}
 
 	// TomY TODO convert these two
 	LLMenuGL*menu;
@@ -607,23 +607,23 @@ void init_menus()
 	///
 	gPieSelf = gUICtrlFactory->buildPieMenu("menu_pie_self.xml", gMenuHolder);
 
-		// TomY TODO: what shall we do about these?
-		gDetachScreenPieMenu = (LLPieMenu*)gMenuHolder->getChildByName("Object Detach HUD", true);
-		gDetachPieMenu = (LLPieMenu*)gMenuHolder->getChildByName("Object Detach", true);
+	// TomY TODO: what shall we do about these?
+	gDetachScreenPieMenu = (LLPieMenu*)gMenuHolder->getChildByName("Object Detach HUD", true);
+	gDetachPieMenu = (LLPieMenu*)gMenuHolder->getChildByName("Object Detach", true);
 
-		if (gAgent.mAccess < SIM_ACCESS_MATURE)
-		{
-			gMenuHolder->getChildByName("Self Underpants", TRUE)->setVisible(FALSE);
-			gMenuHolder->getChildByName("Self Undershirt", TRUE)->setVisible(FALSE);
-		}
+	if (gAgent.mAccess < SIM_ACCESS_MATURE)
+	{
+		gMenuHolder->getChildByName("Self Underpants", TRUE)->setVisible(FALSE);
+		gMenuHolder->getChildByName("Self Undershirt", TRUE)->setVisible(FALSE);
+	}
 
 	gPieAvatar = gUICtrlFactory->buildPieMenu("menu_pie_avatar.xml", gMenuHolder);
 
 	gPieObject = gUICtrlFactory->buildPieMenu("menu_pie_object.xml", gMenuHolder);
 
-		gAttachScreenPieMenu = (LLPieMenu*)gMenuHolder->getChildByName("Object Attach HUD", true);
-		gAttachPieMenu = (LLPieMenu*)gMenuHolder->getChildByName("Object Attach", true);
-		gPieRate = (LLPieMenu*)gMenuHolder->getChildByName("Rate Menu", true);
+	gAttachScreenPieMenu = (LLPieMenu*)gMenuHolder->getChildByName("Object Attach HUD", true);
+	gAttachPieMenu = (LLPieMenu*)gMenuHolder->getChildByName("Object Attach", true);
+	gPieRate = (LLPieMenu*)gMenuHolder->getChildByName("Rate Menu", true);
 
 	gPieAttachment = gUICtrlFactory->buildPieMenu("menu_pie_attachment.xml", gMenuHolder);
 
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index dff2a6c9e0..f95ec9e3cc 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -3887,7 +3887,7 @@ void process_alert_core(const char* buffer, BOOL modal)
 	{
 		//XUI:translate
 		LLString::format_map_t args;
-		args["[BUFFER]"] = buffer;
+		args["[ERROR_MESSAGE]"] = buffer;
 		gViewerWindow->alertXml("ErrorMessage", args);
 	}
 	else