From 7ae912dbbd05213d286bdbb94e8782709fe11e5d Mon Sep 17 00:00:00 2001 From: Jacek Antonelli Date: Sat, 3 Oct 2009 05:37:23 -0500 Subject: Grid manager no longer appends "/" to URIs. This was causing trouble with URIs that shouldn't end in "/". --- ChangeLog.txt | 8 ++++++++ linden/indra/newview/hippoGridManager.cpp | 17 +++++++++-------- 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index 597c595..9e894ec 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,3 +1,11 @@ +2009-10-03 Jacek Antonelli + + * 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-01 McCabe Maxsted * Fixed switched Buy and Create locations in object pie menu (regression). 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; } -- cgit v1.1