EFFECTIVE MERGE: svn merge -r 68118:68999 svn+ssh://svn/svn/linden/branches/maintenance

ACTUAL MERGE: svn merge -r 69685:69687 svn+ssh://svn/svn/linden/branches/release-r69649-maintenance-sync
EQUIVALENT TO: svn merge -r 68118:69663 svn+ssh://svn/svn/linden/branches/maintenance-r68999

1 files changed, 0 insertions, 43 deletions

diff --git a/indra/newview/llsrv.h b/indra/newview/llsrv.h
index fde4f3915d..9876f36ce7 100644
--- a/indra/newview/llsrv.h
+++ b/indra/newview/llsrv.h
@@ -9,52 +9,9 @@
 #ifndef LL_LLSRV_H
 #define LL_LLSRV_H
 
-class LLSRV;
-
-class LLSRVRecord
-{
-	friend class LLSRV;
-
-protected:
-	U16 mPriority;
-	U16 mWeight;
-	std::string mTarget;
-	U16 mPort;
-
-public:
-	LLSRVRecord(U16 priority, U16 weight, const std::string& target,
-				U16 port) :
-		mPriority(priority),
-		mWeight(weight),
-		mTarget(target),
-		mPort(port) {
-	}
-
-	U16 priority() const { return mPriority; }
-	U16 weight() const { return mWeight; }
-	const std::string& target() const { return mTarget; }
-	U16 port() const { return mPort; }
-
-	struct ComparePriorityLowest
-	{
-		bool operator()(const LLSRVRecord& lhs, const LLSRVRecord& rhs)
-		{
-			return lhs.mPriority < rhs.mPriority;
-		}
-	};
-};
-	
 class LLSRV
 {
-protected:
-#ifndef LL_WINDOWS
-	static std::vector<LLSRVRecord> parseResponse(const unsigned char *response,
-												  int resp_len);
-#endif
-	static std::vector<LLSRVRecord> reorder(std::vector<LLSRVRecord>& recs);
-
 public:
-	static std::vector<LLSRVRecord> query(const std::string& name);
 	static std::vector<std::string> rewriteURI(const std::string& uri);
 };