From 1015adf32256b6ffeb44f5e75df537f5562fa7ae Mon Sep 17 00:00:00 2001
From: PavelK ProductEngine <pkrivich@productengine.com>
Date: Thu, 25 Jul 2013 19:37:15 +0300
Subject: MAINT-2715 FIX Capabilities request handling not working properly if
 request gets lost

---
 indra/newview/llworld.cpp | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'indra/newview/llworld.cpp')

diff --git a/indra/newview/llworld.cpp b/indra/newview/llworld.cpp
index 7996f8a640..103668d051 100755
--- a/indra/newview/llworld.cpp
+++ b/indra/newview/llworld.cpp
@@ -140,6 +140,7 @@ LLViewerRegion* LLWorld::addRegion(const U64 &region_handle, const LLHost &host)
 {
 	llinfos << "Add region with handle: " << region_handle << " on host " << host << llendl;
 	LLViewerRegion *regionp = getRegionFromHandle(region_handle);
+	std::string seedUrl;
 	if (regionp)
 	{
 		llinfos << "Region exists, removing it " << llendl;
@@ -161,6 +162,9 @@ LLViewerRegion* LLWorld::addRegion(const U64 &region_handle, const LLHost &host)
 			llwarns << "LLWorld::addRegion exists, but isn't alive" << llendl;
 		}
 
+		// Save capabilities seed URL
+		seedUrl = regionp->getCapability("Seed");
+
 		// Kill the old host, and then we can continue on and add the new host.  We have to kill even if the host
 		// matches, because all the agent state for the new camera is completely different.
 		removeRegion(old_host);
@@ -188,6 +192,11 @@ LLViewerRegion* LLWorld::addRegion(const U64 &region_handle, const LLHost &host)
 		llerrs << "Unable to create new region!" << llendl;
 	}
 
+	if ( !seedUrl.empty() )
+	{
+		regionp->setCapability("Seed", seedUrl);
+	}
+
 	mRegionList.push_back(regionp);
 	mActiveRegionList.push_back(regionp);
 	mCulledRegionList.push_back(regionp);
-- 
cgit v1.2.3


From 6bb9975de1d3122ec83a5391b35a46ec20d66606 Mon Sep 17 00:00:00 2001
From: simon <none@none>
Date: Fri, 14 Feb 2014 14:02:34 -0800
Subject: MAINT-3724 : LLWorld::addRegion logging is misleading

---
 indra/newview/llworld.cpp | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

(limited to 'indra/newview/llworld.cpp')

diff --git a/indra/newview/llworld.cpp b/indra/newview/llworld.cpp
index 103668d051..85614f397c 100755
--- a/indra/newview/llworld.cpp
+++ b/indra/newview/llworld.cpp
@@ -143,23 +143,24 @@ LLViewerRegion* LLWorld::addRegion(const U64 &region_handle, const LLHost &host)
 	std::string seedUrl;
 	if (regionp)
 	{
-		llinfos << "Region exists, removing it " << llendl;
 		LLHost old_host = regionp->getHost();
 		// region already exists!
 		if (host == old_host && regionp->isAlive())
 		{
 			// This is a duplicate for the same host and it's alive, don't bother.
+			llinfos << "Region already exists and is alive, using existing region" << llendl;
 			return regionp;
 		}
 
 		if (host != old_host)
 		{
 			llwarns << "LLWorld::addRegion exists, but old host " << old_host
-					<< " does not match new host " << host << llendl;
+					<< " does not match new host " << host 
+					<< ", removing old region and creating new" << llendl;
 		}
 		if (!regionp->isAlive())
 		{
-			llwarns << "LLWorld::addRegion exists, but isn't alive" << llendl;
+			llwarns << "LLWorld::addRegion exists, but isn't alive. Removing old region and creating new" << llendl;
 		}
 
 		// Save capabilities seed URL
@@ -169,14 +170,18 @@ LLViewerRegion* LLWorld::addRegion(const U64 &region_handle, const LLHost &host)
 		// matches, because all the agent state for the new camera is completely different.
 		removeRegion(old_host);
 	}
+	else
+	{
+		llinfos << "Region does not exist, creating new one" << llendl;
+	}
 
 	U32 iindex = 0;
 	U32 jindex = 0;
 	from_region_handle(region_handle, &iindex, &jindex);
 	S32 x = (S32)(iindex/mWidth);
 	S32 y = (S32)(jindex/mWidth);
-	llinfos << "Adding new region (" << x << ":" << y << ")" << llendl;
-	llinfos << "Host: " << host << llendl;
+	llinfos << "Adding new region (" << x << ":" << y << ")" 
+		<< " on host: " << host << llendl;
 
 	LLVector3d origin_global;
 
-- 
cgit v1.2.3