merge viewer/viewer_1-21 94170-94770 -> release

merge viewer/viewer_1-21-0 94830-95157 -> release
Includes:
QAR-786 Sandbox buildme for viewer + server Release Notes on the wiki!
QAR-797 teleport failures (DEV-6198 / SVC-972) mergeme

1 files changed, 18 insertions, 5 deletions

diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp
index bfb082885c..b22ca7d2e9 100644
--- a/indra/newview/llviewerregion.cpp
+++ b/indra/newview/llviewerregion.cpp
@@ -50,7 +50,6 @@
 #include "lldir.h"
 #include "lleventpoll.h"
 #include "llfloatergodtools.h"
-#include "llfloaterreleasemsg.h"
 #include "llfloaterreporter.h"
 #include "llfloaterregioninfo.h"
 #include "llhttpnode.h"
@@ -121,10 +120,9 @@ public:
 				<< iter->first << LL_ENDL;
 
 			/* HACK we're waiting for the ServerReleaseNotes */
-			if ((iter->first == "ServerReleaseNotes") && (LLFloaterReleaseMsg::sDisplayMessage))
+			if (iter->first == "ServerReleaseNotes" && mRegion->getReleaseNotesRequested())
 			{
-				LLFloaterReleaseMsg::show();
-				LLFloaterReleaseMsg::sDisplayMessage = false;
+				mRegion->showReleaseNotes();
 			}
 		}
 		
@@ -167,7 +165,8 @@ LLViewerRegion::LLViewerRegion(const U64 &handle,
 	mCacheLoaded(FALSE),
 	mCacheEntriesCount(0),
 	mCacheID(),
-	mEventPoll(NULL)
+	mEventPoll(NULL),
+	mReleaseNotesRequested(FALSE)
 {
 	mWidth = region_width_meters;
 	mOriginGlobal = from_region_handle(handle); 
@@ -1480,3 +1479,17 @@ LLSpatialPartition* LLViewerRegion::getSpatialPartition(U32 type)
 	return NULL;
 }
 
+void LLViewerRegion::showReleaseNotes()
+{
+	std::string url = this->getCapability("ServerReleaseNotes");
+
+	if (url.empty()) {
+		// HACK haven't received the capability yet, we'll wait until
+		// it arives.
+		mReleaseNotesRequested = TRUE;
+		return;
+	}
+
+	LLWeb::loadURL(url);
+	mReleaseNotesRequested = FALSE;
+}