Merge commit 'jacek/next' into next

2 files changed, 17 insertions, 8 deletions

diff --git a/ChangeLog.txt b/ChangeLog.txt
index 5392671..b3e4679 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -138,6 +138,14 @@ modified:   linden/indra/newview/skins/default/xui/en-us/notify.xml
           modified:   linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml
 
 
+2009-10-03  Jacek Antonelli  <jacek.antonelli@gmail.com>
+
+        * Grid manager no longer appends "/" to URIs.
+          This was causing trouble with URIs that shouldn't end in "/".
+
+          modified:   linden/indra/newview/hippoGridManager.cpp
+
+
 2009-10-03 McCabe Maxsted  <hakushakukun@gmail.com>
 
         * Fixed layout of debug permissions in tools window.
diff --git a/linden/indra/newview/hippoGridManager.cpp b/linden/indra/newview/hippoGridManager.cpp
index 7a2a3e9..71e3a95 100644
--- a/linden/indra/newview/hippoGridManager.cpp
+++ b/linden/indra/newview/hippoGridManager.cpp
@@ -469,14 +469,15 @@ std::string HippoGridInfo::sanitizeGridNick(std::string &gridnick)
 // static
 std::string HippoGridInfo::sanitizeUri(std::string &uri)
 {
-        if (uri.empty()) {
-                return "";
-        }
-
-        // If last character in uri is not "/"
-        if (uri.compare(uri.length()-1, 1, "/") != 0) {
-                return uri + '/';
-        }
+        // if (uri.empty()) {
+        //      return "";
+        // }
+
+        // // If last character in uri is not "/"
+        // // NOTE: This wrongly assumes that all URIs should end with "/"!
+        // if (uri.compare(uri.length()-1, 1, "/") != 0) {
+        //      return uri + '/';
+        // }
 
         return uri;
 }