Merge viewer-lion

indra/llui/lltextbase.cpp

@@ -299,9 +299,8 @@ LLTextBase::~LLTextBase()
 {
 	mSegments.clear();
 	delete mURLClickSignal;
-	// <FS:Ansariel> Properly free the signals
 	delete mIsFriendSignal;
-	// </FS:Ansariel>
+	delete mIsObjectBlockedSignal;
 }
 
 void LLTextBase::initFromParams(const LLTextBase::Params& p)

indra/newview/llfloaterdeleteprefpreset.cpp

@@ -53,6 +53,8 @@ BOOL LLFloaterDeletePrefPreset::postBuild()
 	getChild<LLButton>("cancel")->setCommitCallback(boost::bind(&LLFloaterDeletePrefPreset::onBtnCancel, this));
 	LLPresetsManager::instance().setPresetListChangeCallback(boost::bind(&LLFloaterDeletePrefPreset::onPresetsListChange, this));
 
+	onPresetsListChange(); // ensure that delete button is disabled when the list is empty
+
 	return TRUE;
 }
 

indra/newview/llviewerregion.cpp

@@ -273,21 +273,16 @@ void LLViewerRegionImpl::requestBaseCapabilitiesCoro(U64 regionHandle)
         }
 
         S32 id = ++mHttpResponderID;
-		// <FS:Ansariel> Increment after posting (progress showing wrong attempt otherwise)
-        //++mSeedCapAttempts;
 
         LLSD capabilityNames = LLSD::emptyArray();
         buildCapabilityNames(capabilityNames);
 
         LL_INFOS("AppInit", "Capabilities") << "Requesting seed from " << url 
-		// <FS:Ansariel> Increment after posting (progress showing wrong attempt otherwise)
-        //    << " (attempt #" << mSeedCapAttempts << ")" << LL_ENDL;
             << " (attempt #" << mSeedCapAttempts + 1 << ")" << LL_ENDL;
 
         regionp = NULL;
         result = httpAdapter->postAndSuspend(httpRequest, url, capabilityNames);
 
-		// <FS:Ansariel> Increment after posting (progress showing wrong attempt otherwise)
         ++mSeedCapAttempts;
 
         regionp = LLWorld::getInstance()->getRegionFromHandle(regionHandle);

indra/newview/skins/default/xui/en/notifications.xml

@@ -8935,14 +8935,14 @@ Failed to save appearance to XML.
 
   <notification
     icon="notifytip.tga"
-	name="PresetNotSaved"
+    name="PresetNotSaved"
     type="notifytip">
 Error saving preset [NAME].
   </notification>
 
   <notification
     icon="notifytip.tga"
-	name="PresetNotDeleted"
+    name="PresetNotDeleted"
     type="notifytip">
 Error deleting preset [NAME].
   </notification>