svn merge --ignore-ancestry svn+ssh://svn/svn/linden/release@65088 svn+ssh://svn/svn/linden/branches/release-candidate@65078 -> release Paired by Tess and rdw.

1 files changed, 6 insertions, 6 deletions

diff --git a/indra/llmessage/llhost.cpp b/indra/llmessage/llhost.cpp
index 6a74cfe831..9fa98cf09c 100644
--- a/indra/llmessage/llhost.cpp
+++ b/indra/llmessage/llhost.cpp
@@ -210,9 +210,9 @@ std::ostream& operator<< (std::ostream& os, const LLHost &hh)
 }
 
 
-std::istream& operator>> (std::istream& is, LLHost &rh)
-{
-	is >> rh.mIP;
-    is >> rh.mPort;
-    return is;
-}
+//std::istream& operator>> (std::istream& is, LLHost &rh)
+//{
+//	is >> rh.mIP;
+//    is >> rh.mPort;
+//    return is;
+//}