From 3680e022fca1576d8021ad53bfd1852b5398ba23 Mon Sep 17 00:00:00 2001
From: Aleric Inglewood <Aleric.Inglewood@gmail.com>
Date: Thu, 16 Feb 2012 02:32:31 +0100
Subject: [PATCH] LLViewerRegion: WIP - header changes and anticipated compile
 fixes

Does not compile now.
llviewerregion.cpp wasn't touched.
Other changes elsewhere in the code (like in llstartup.cpp) might still be needed.
---
 indra/newview/llfloaterbuyland.cpp    |  2 +-
 indra/newview/llfloaterland.cpp       |  4 ++--
 indra/newview/llfloaterregioninfo.cpp |  2 +-
 indra/newview/llviewerregion.h        | 20 ++++++++++++++------
 4 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/indra/newview/llfloaterbuyland.cpp b/indra/newview/llfloaterbuyland.cpp
index c80708879..4926453e0 100644
--- a/indra/newview/llfloaterbuyland.cpp
+++ b/indra/newview/llfloaterbuyland.cpp
@@ -540,7 +540,7 @@ void LLFloaterBuyLandUI::updateCovenantInfo()
 	LLTextBox* region_type = getChild<LLTextBox>("region_type_text");
 	if (region_type)
 	{
-		region_type->setText(region->getSimProductName());
+		region_type->setText(region->getLocalizedSimProductName());
 	}
 	
 	LLTextBox* resellable_clause = getChild<LLTextBox>("resellable_clause");
diff --git a/indra/newview/llfloaterland.cpp b/indra/newview/llfloaterland.cpp
index 451d4472b..14260b1dc 100644
--- a/indra/newview/llfloaterland.cpp
+++ b/indra/newview/llfloaterland.cpp
@@ -525,7 +525,7 @@ void LLPanelLandGeneral::refresh()
 		if (regionp)
 		{
 			mContentRating->setText(regionp->getSimAccessString());
-			mLandType->setText(regionp->getSimProductName());
+			mLandType->setText(regionp->getLocalizedSimProductName());
 		}
 
 		// estate owner/manager cannot edit other parts of the parcel
@@ -2907,7 +2907,7 @@ void LLPanelLandCovenant::refresh()
 	LLTextBox* region_landtype = getChild<LLTextBox>("region_landtype_text");
 	if (region_landtype)
 	{
-		region_landtype->setText(region->getSimProductName());
+		region_landtype->setText(region->getLocalizedSimProductName());
 	}
 	
 	LLTextBox* region_maturity = getChild<LLTextBox>("region_maturity_text");
diff --git a/indra/newview/llfloaterregioninfo.cpp b/indra/newview/llfloaterregioninfo.cpp
index 54ab0701d..794e774fe 100644
--- a/indra/newview/llfloaterregioninfo.cpp
+++ b/indra/newview/llfloaterregioninfo.cpp
@@ -2720,7 +2720,7 @@ bool LLPanelEstateCovenant::refreshFromRegion(LLViewerRegion* region)
 	LLTextBox* region_landtype = getChild<LLTextBox>("region_landtype_text");
 	if (region_landtype)
 	{
-		region_landtype->setText(region->getSimProductName());
+		region_landtype->setText(region->getLocalizedSimProductName());
 	}
 	
 	
diff --git a/indra/newview/llviewerregion.h b/indra/newview/llviewerregion.h
index 24e5f9052..3d33e9b7f 100644
--- a/indra/newview/llviewerregion.h
+++ b/indra/newview/llviewerregion.h
@@ -67,7 +67,6 @@ class LLVOCache;
 class LLVOCacheEntry;
 class LLSpatialPartition;
 class LLEventPump;
-//class LLCapabilityListener;
 class LLDataPacker;
 class LLDataPackerBinaryBuffer;
 class LLHost;
@@ -199,7 +198,7 @@ public:
 	S32 getSimCPURatio()                   const { return mCPURatio; }
 	const std::string& getSimColoName()    const { return mColoName; }
 	const std::string& getSimProductSKU()  const { return mProductSKU; }
-	const std::string& getSimProductName() const { return mProductName; }
+	std::string getLocalizedSimProductName() const;
 
 	// Returns "Sandbox", "Expensive", etc.
 	static std::string regionFlagsToString(U32 flags);
@@ -209,7 +208,10 @@ public:
 
 	// Returns "M", "PG", "A" etc.
 	static std::string accessToShortString(U8 sim_access);
-	
+
+	// Return access icon name
+	static std::string getAccessIcon(U8 sim_access);
+
 	// helper function which just makes sure all interested parties
 	// can process the message.
 	static void processRegionInfo(LLMessageSystem* msg, void**);
@@ -230,11 +232,12 @@ public:
 
 	U32	getPacketsLost() const;
 
-	void setHttpResponderPtrNULL();
-	const LLHTTPClient::ResponderPtr getHttpResponderPtr() const;
+	S32 getHttpResponderID() const;
 
 	// Get/set named capability URLs for this region.
 	void setSeedCapability(const std::string& url);
+	void failedSeedCapability();
+	S32 getNumSeedCapRetries();
 	void setCapability(const std::string& name, const std::string& url);
 	// implements LLCapabilityProvider
     virtual std::string getCapability(const std::string& name) const;
@@ -249,7 +252,7 @@ public:
 
     /// Get LLEventPump on which we listen for capability requests
     /// (https://wiki.lindenlab.com/wiki/Viewer:Messaging/Messaging_Notes#Capabilities)
-   // LLEventPump& getCapAPI() const;
+    LLEventPump& getCapAPI() const;
 
     /// implements LLCapabilityProvider
 	/*virtual*/ const LLHost& getHost() const;
@@ -328,6 +331,11 @@ public:
 	LLSpatialPartition* getSpatialPartition(U32 type);
 
 	bool objectIsReturnable(const LLVector3& pos, const std::vector<LLBBox>& boxes) const;
+	bool childrenObjectReturnable( const std::vector<LLBBox>& boxes ) const;
+	bool objectsCrossParcel(const std::vector<LLBBox>& boxes) const;
+
+	void getNeighboringRegions( std::vector<LLViewerRegion*>& uniqueRegions );
+
 public:
 	struct CompareDistance
 	{