2 files changed, 13 insertions, 2 deletions

diff --git a/ChangeLog.txt b/ChangeLog.txt
index f1c872b..b078776 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,5 +1,11 @@
 2009-09-25  Jacek Antonelli  <jacek.antonelli@gmail.com>
 
+        * Fixed HippoGridInfo::cleanUpUri appending "/" stupidly.
+          It was appending it to an empty string, "/", "//", etc.
+
+          modified:   linden/indra/newview/hippoGridManager.cpp
+
+
         * Rearranged login screen and cleaned up XUI.
 
           modified:   linden/indra/newview/skins/default/xui/en-us/panel_login.xml
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 += '/';
+        }
 }