aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--ChangeLog.txt8
-rw-r--r--linden/indra/newview/hippoGridManager.cpp17
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 @@
12009-10-03 Jacek Antonelli <jacek.antonelli@gmail.com>
2
3 * Grid manager no longer appends "/" to URIs.
4 This was causing trouble with URIs that shouldn't end in "/".
5
6 modified: linden/indra/newview/hippoGridManager.cpp
7
8
12009-10-01 McCabe Maxsted <hakushakukun@gmail.com> 92009-10-01 McCabe Maxsted <hakushakukun@gmail.com>
2 10
3 * Fixed switched Buy and Create locations in object pie menu (regression). 11 * 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)
469// static 469// static
470std::string HippoGridInfo::sanitizeUri(std::string &uri) 470std::string HippoGridInfo::sanitizeUri(std::string &uri)
471{ 471{
472 if (uri.empty()) { 472 // if (uri.empty()) {
473 return ""; 473 // return "";
474 } 474 // }
475 475
476 // If last character in uri is not "/" 476 // // If last character in uri is not "/"
477 if (uri.compare(uri.length()-1, 1, "/") != 0) { 477 // // NOTE: This wrongly assumes that all URIs should end with "/"!
478 return uri + '/'; 478 // if (uri.compare(uri.length()-1, 1, "/") != 0) {
479 } 479 // return uri + '/';
480 // }
480 481
481 return uri; 482 return uri;
482} 483}