From 84e05d14a1af01858a2f099d9619e95d6e8e4f3d Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Fri, 22 Jun 2018 22:35:28 +0200
Subject: [PATCH] Build fix ("hyper" is already defined in some Windows API
 header)

---
 indra/newview/fsslurl.cpp | 30 +++++++++++++++---------------
 indra/newview/fsslurl.h   | 10 +++++-----
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/indra/newview/fsslurl.cpp b/indra/newview/fsslurl.cpp
index 5307651f5b..a07f2700fa 100644
--- a/indra/newview/fsslurl.cpp
+++ b/indra/newview/fsslurl.cpp
@@ -325,15 +325,15 @@ LLSLURL::LLSLURL(const std::string& slurl)
 				// (or its a slurl.com or maps.secondlife.com URL).
 				std::string probe_grid;
 
-				std::string hyper = slurl_uri.hostNameAndPort();
-				std::string hyper_trimmed = LLGridManager::getInstance()->trimHypergrid(hyper);
-				if (hyper != hyper_trimmed)
+				std::string hypergrid = slurl_uri.hostNameAndPort();
+				std::string hyper_trimmed = LLGridManager::getInstance()->trimHypergrid(hypergrid);
+				if (hypergrid != hyper_trimmed)
 				{
 					mHypergrid = true;
-					path_array.insert(0,hyper);
+					path_array.insert(0, hypergrid);
 				}
 
-				probe_grid = LLGridManager::getInstance()->getGridByProbing(hyper);
+				probe_grid = LLGridManager::getInstance()->getGridByProbing(hypergrid);
 				if (probe_grid.empty())
 				{
 					probe_grid = LLGridManager::getInstance()->getGridByProbing(slurl_uri.hostName());
@@ -479,8 +479,8 @@ LLSLURL::LLSLURL(const std::string& slurl)
 }
 
 // Create a slurl for the middle of the region
-LLSLURL::LLSLURL(const std::string& grid, const std::string& region, bool hyper)
-: mHypergrid(hyper)
+LLSLURL::LLSLURL(const std::string& grid, const std::string& region, bool hypergrid)
+: mHypergrid(hypergrid)
 {
 	mGrid = grid;
 	mRegion = region;
@@ -490,8 +490,8 @@ LLSLURL::LLSLURL(const std::string& grid, const std::string& region, bool hyper)
 
 // create a slurl given the position.  The position will be modded with the region
 // width handling global positions as well
-LLSLURL::LLSLURL(const std::string& grid, const std::string& region, const LLVector3& position, bool hyper)
-: mHypergrid(hyper)
+LLSLURL::LLSLURL(const std::string& grid, const std::string& region, const LLVector3& position, bool hypergrid)
+: mHypergrid(hypergrid)
 {
 	mGrid = grid;
 	mRegion = region;
@@ -516,15 +516,15 @@ LLSLURL::LLSLURL(const std::string& grid, const std::string& region, const LLVec
 }
 
 // create a simstring
-LLSLURL::LLSLURL(const std::string& region, const LLVector3& position, bool hyper)
-: mHypergrid(hyper)
+LLSLURL::LLSLURL(const std::string& region, const LLVector3& position, bool hypergrid)
+: mHypergrid(hypergrid)
 {
 	*this = LLSLURL(LLGridManager::getInstance()->getGrid(), region, position);
 }
 
 // create a slurl from a global position
-LLSLURL::LLSLURL(const std::string& grid, const std::string& region, const LLVector3d& global_position, bool hyper)
-: mHypergrid(hyper)
+LLSLURL::LLSLURL(const std::string& grid, const std::string& region, const LLVector3d& global_position, bool hypergrid)
+: mHypergrid(hypergrid)
 {
 // <FS:CR> Aurora-sim var region teleports
 	//*this = LLSLURL(grid,
@@ -540,8 +540,8 @@ LLSLURL::LLSLURL(const std::string& grid, const std::string& region, const LLVec
 }
 
 // create a slurl from a global position
-LLSLURL::LLSLURL(const std::string& region, const LLVector3d& global_position, bool hyper)
-: mHypergrid(hyper)
+LLSLURL::LLSLURL(const std::string& region, const LLVector3d& global_position, bool hypergrid)
+: mHypergrid(hypergrid)
 {
 	*this = LLSLURL(LLGridManager::getInstance()->getGrid(), region, global_position);
 }
diff --git a/indra/newview/fsslurl.h b/indra/newview/fsslurl.h
index ef19cda080..e01764190b 100644
--- a/indra/newview/fsslurl.h
+++ b/indra/newview/fsslurl.h
@@ -70,11 +70,11 @@ public:
 
 	LLSLURL(): mType(INVALID)  { }
 	LLSLURL(const std::string& slurl);
-	LLSLURL(const std::string& grid, const std::string& region, bool hyper = false);
-	LLSLURL(const std::string& region, const LLVector3& position, bool hyper = false);
-	LLSLURL(const std::string& grid, const std::string& region, const LLVector3& position, bool hyper = false);
-	LLSLURL(const std::string& grid, const std::string& region, const LLVector3d& global_position, bool hyper = false);
-	LLSLURL(const std::string& region, const LLVector3d& global_position, bool hyper = false);
+	LLSLURL(const std::string& grid, const std::string& region, bool hypergrid = false);
+	LLSLURL(const std::string& region, const LLVector3& position, bool hypergrid = false);
+	LLSLURL(const std::string& grid, const std::string& region, const LLVector3& position, bool hypergrid = false);
+	LLSLURL(const std::string& grid, const std::string& region, const LLVector3d& global_position, bool hypergrid = false);
+	LLSLURL(const std::string& region, const LLVector3d& global_position, bool hypergrid = false);
 	LLSLURL(const std::string& command, const LLUUID&id, const std::string& verb);
 	LLSLURL(const LLSD& path_array, bool from_app);