From df2fd502ceb13d4699ca7a59ba6d13beb1cb3b00 Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Fri, 25 Sep 2009 03:57:51 -0500
Subject: Fixed HippoGridInfo::cleanUpUri appending "/" stupidly.

It was appending it to an empty string, "/", "//", etc.
---
 linden/indra/newview/hippoGridManager.cpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'linden/indra/newview/hippoGridManager.cpp')

diff --git a/linden/indra/newview/hippoGridManager.cpp b/linden/indra/newview/hippoGridManager.cpp
index c7693af..0208844 100644
--- a/linden/indra/newview/hippoGridManager.cpp
+++ b/linden/indra/newview/hippoGridManager.cpp
@@ -277,9 +277,14 @@ void HippoGridInfo::cleanUpGridNick(std::string &gridnick)
 // static
 void HippoGridInfo::cleanUpUri(std::string &uri)
 {
-	std::string::size_type n = uri.rfind('/');
-	if ((n == std::string::npos) || (n < 10))
+	if (uri.empty()) {
+		return;
+	}
+
+	// If last character in uri is not "/"
+	if (uri.compare(uri.length()-1, 1, "/") != 0) {
 		uri += '/';
+	}
 }
 
 
-- 
cgit v1.1