diff options
| author | Jacek Antonelli | 2009-10-03 05:37:23 -0500 |
|---|---|---|
| committer | Jacek Antonelli | 2009-10-03 05:37:23 -0500 |
| commit | 7ae912dbbd05213d286bdbb94e8782709fe11e5d (patch) | |
| tree | 5528a4365683a2edfa30472c834cb6c99f6550f2 /linden | |
| parent | Merge remote branch 'mccabe/next' into next (diff) | |
| download | meta-impy-7ae912dbbd05213d286bdbb94e8782709fe11e5d.zip meta-impy-7ae912dbbd05213d286bdbb94e8782709fe11e5d.tar.gz meta-impy-7ae912dbbd05213d286bdbb94e8782709fe11e5d.tar.bz2 meta-impy-7ae912dbbd05213d286bdbb94e8782709fe11e5d.tar.xz | |
Grid manager no longer appends "/" to URIs.
This was causing trouble with URIs that shouldn't end in "/".
Diffstat (limited to 'linden')
| -rw-r--r-- | linden/indra/newview/hippoGridManager.cpp | 17 |
1 files changed, 9 insertions, 8 deletions
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 |
| 470 | std::string HippoGridInfo::sanitizeUri(std::string &uri) | 470 | std::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 | } |