svn merge -r 72652:72881 svn+ssh://svn.lindenlab.com/svn/linden/branches/sl-search-11 --> release

QAR-11: pair-reviewed the merge w/ Sam.

1 files changed, 17 insertions, 12 deletions

diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp
index dd5dba7de5..5e17ff0a57 100644
--- a/indra/newview/llviewerregion.cpp
+++ b/indra/newview/llviewerregion.cpp
@@ -1345,30 +1345,35 @@ void LLViewerRegion::setSeedCapability(const std::string& url)
 	setCapability("Seed", url);
 
 	LLSD capabilityNames = LLSD::emptyArray();
+	capabilityNames.append("ChatSessionRequest");
+	capabilityNames.append("CopyInventoryFromNotecard");
+	capabilityNames.append("DispatchRegionInfo");
+	capabilityNames.append("EventQueueGet");
 	capabilityNames.append("MapLayer");
 	capabilityNames.append("MapLayerGod");
 	capabilityNames.append("NewFileAgentInventory");
-	capabilityNames.append("EventQueueGet");
+	capabilityNames.append("ParcelGodReserveForNewbie");
+	capabilityNames.append("ParcelVoiceInfoRequest");
+	capabilityNames.append("ProvisionVoiceAccountRequest");
+	capabilityNames.append("RemoteParcelRequest");
+	capabilityNames.append("RequestTextureDownload");
+	capabilityNames.append("SearchStatRequest");
+	capabilityNames.append("SearchStatTracking");
+	capabilityNames.append("SendPostcard");
+	capabilityNames.append("SendUserReport");
+	capabilityNames.append("SendUserReportWithScreenshot");
+	capabilityNames.append("ServerReleaseNotes");
 	capabilityNames.append("UpdateGestureAgentInventory");
 	capabilityNames.append("UpdateNotecardAgentInventory");
 	capabilityNames.append("UpdateScriptAgentInventory");
 	capabilityNames.append("UpdateGestureTaskInventory");
 	capabilityNames.append("UpdateNotecardTaskInventory");
 	capabilityNames.append("UpdateScriptTaskInventory");
-	capabilityNames.append("SendPostcard");
 	capabilityNames.append("ViewerStartAuction");
-	capabilityNames.append("ParcelGodReserveForNewbie");
-	capabilityNames.append("SendUserReport");
-	capabilityNames.append("SendUserReportWithScreenshot");
-	capabilityNames.append("RequestTextureDownload");
 	capabilityNames.append("UntrustedSimulatorMessage");
-	capabilityNames.append("ParcelVoiceInfoRequest");
-	capabilityNames.append("ChatSessionRequest");
 	capabilityNames.append("ViewerStats");
-	capabilityNames.append("ProvisionVoiceAccountRequest");
-	capabilityNames.append("ServerReleaseNotes");
-	capabilityNames.append("CopyInventoryFromNotecard");
-	capabilityNames.append("DispatchRegionInfo");
+	// Please add new capabilities alphabetically to reduce
+	// merge conflicts.
 
 	llinfos << "posting to seed " << url << llendl;