diff options
Diffstat (limited to '')
| -rw-r--r-- | linden/indra/llmessage/llservicebuilder.cpp | 62 |
1 files changed, 34 insertions, 28 deletions
diff --git a/linden/indra/llmessage/llservicebuilder.cpp b/linden/indra/llmessage/llservicebuilder.cpp index 0b35a69..4fb3530 100644 --- a/linden/indra/llmessage/llservicebuilder.cpp +++ b/linden/indra/llmessage/llservicebuilder.cpp | |||
| @@ -2,28 +2,31 @@ | |||
| 2 | * @file llservicebuilder.cpp | 2 | * @file llservicebuilder.cpp |
| 3 | * @brief Implementation of the LLServiceBuilder class. | 3 | * @brief Implementation of the LLServiceBuilder class. |
| 4 | * | 4 | * |
| 5 | * Copyright (c) 2007-2007, Linden Research, Inc. | 5 | * $LicenseInfo:firstyear=2007&license=viewergpl$ |
| 6 | * | 6 | * |
| 7 | * Second Life Viewer Source Code | 7 | * Copyright (c) 2007, Linden Research, Inc. |
| 8 | * The source code in this file ("Source Code") is provided by Linden Lab | 8 | * |
| 9 | * to you under the terms of the GNU General Public License, version 2.0 | 9 | * Second Life Viewer Source Code |
| 10 | * ("GPL"), unless you have obtained a separate licensing agreement | 10 | * The source code in this file ("Source Code") is provided by Linden Lab |
| 11 | * ("Other License"), formally executed by you and Linden Lab. Terms of | 11 | * to you under the terms of the GNU General Public License, version 2.0 |
| 12 | * the GPL can be found in doc/GPL-license.txt in this distribution, or | 12 | * ("GPL"), unless you have obtained a separate licensing agreement |
| 13 | * online at http://secondlife.com/developers/opensource/gplv2 | 13 | * ("Other License"), formally executed by you and Linden Lab. Terms of |
| 14 | * | 14 | * the GPL can be found in doc/GPL-license.txt in this distribution, or |
| 15 | * There are special exceptions to the terms and conditions of the GPL as | 15 | * online at http://secondlife.com/developers/opensource/gplv2 |
| 16 | * it is applied to this Source Code. View the full text of the exception | 16 | * |
| 17 | * in the file doc/FLOSS-exception.txt in this software distribution, or | 17 | * There are special exceptions to the terms and conditions of the GPL as |
| 18 | * online at http://secondlife.com/developers/opensource/flossexception | 18 | * it is applied to this Source Code. View the full text of the exception |
| 19 | * | 19 | * in the file doc/FLOSS-exception.txt in this software distribution, or |
| 20 | * By copying, modifying or distributing this software, you acknowledge | 20 | * online at http://secondlife.com/developers/opensource/flossexception |
| 21 | * that you have read and understood your obligations described above, | 21 | * |
| 22 | * and agree to abide by those obligations. | 22 | * By copying, modifying or distributing this software, you acknowledge |
| 23 | * | 23 | * that you have read and understood your obligations described above, |
| 24 | * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO | 24 | * and agree to abide by those obligations. |
| 25 | * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY, | 25 | * |
| 26 | * COMPLETENESS OR PERFORMANCE. | 26 | * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO |
| 27 | * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY, | ||
| 28 | * COMPLETENESS OR PERFORMANCE. | ||
| 29 | * $/LicenseInfo$ | ||
| 27 | */ | 30 | */ |
| 28 | 31 | ||
| 29 | #include "linden_common.h" | 32 | #include "linden_common.h" |
| @@ -138,16 +141,19 @@ std::string LLServiceBuilder::buildServiceURI( | |||
| 138 | { | 141 | { |
| 139 | std::string query_str = LLURI::mapToQueryString( | 142 | std::string query_str = LLURI::mapToQueryString( |
| 140 | (*option_itr).second); | 143 | (*option_itr).second); |
| 141 | if(!query_str.empty()) | 144 | service_url.replace( |
| 142 | { | 145 | find_pos, |
| 143 | service_url.replace( | 146 | variable_name.length(), |
| 144 | find_pos, | 147 | query_str); |
| 145 | variable_name.length(), | ||
| 146 | query_str); | ||
| 147 | } | ||
| 148 | } | 148 | } |
| 149 | } | 149 | } |
| 150 | } | 150 | } |
| 151 | 151 | ||
| 152 | if (service_url.find('{') != std::string::npos) | ||
| 153 | { | ||
| 154 | llwarns << "Constructed a likely bogus service URL: " << service_url | ||
| 155 | << llendl; | ||
| 156 | } | ||
| 157 | |||
| 152 | return service_url; | 158 | return service_url; |
| 153 | } | 159 | } |