diff options
Diffstat (limited to '')
-rw-r--r-- | linden/indra/llmessage/llservicebuilder.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/linden/indra/llmessage/llservicebuilder.cpp b/linden/indra/llmessage/llservicebuilder.cpp index 195e24b..138ab2d 100644 --- a/linden/indra/llmessage/llservicebuilder.cpp +++ b/linden/indra/llmessage/llservicebuilder.cpp | |||
@@ -134,6 +134,9 @@ std::string LLServiceBuilder::buildServiceURI( | |||
134 | std::string::iterator end(service_url.end()); | 134 | std::string::iterator end(service_url.end()); |
135 | std::string::iterator deepest_node(service_url.end()); | 135 | std::string::iterator deepest_node(service_url.end()); |
136 | std::string::iterator deepest_node_end(service_url.end()); | 136 | std::string::iterator deepest_node_end(service_url.end()); |
137 | //parse out the variables to replace by going through {}s one at a time, | ||
138 | // starting with the "deepest" in series {{}}, | ||
139 | // and otherwise replacing right-to-left | ||
137 | for(; iter != end; ++iter) | 140 | for(; iter != end; ++iter) |
138 | { | 141 | { |
139 | switch(*iter) | 142 | switch(*iter) |
@@ -163,7 +166,7 @@ std::string LLServiceBuilder::buildServiceURI( | |||
163 | { | 166 | { |
164 | break; | 167 | break; |
165 | } | 168 | } |
166 | 169 | //replace the variable we found in the {} above. | |
167 | // *NOTE: since the c++ implementation only understands | 170 | // *NOTE: since the c++ implementation only understands |
168 | // params and straight string substitution, so it's a | 171 | // params and straight string substitution, so it's a |
169 | // known distance of 2 to skip the directive. | 172 | // known distance of 2 to skip the directive. |
@@ -181,7 +184,7 @@ std::string LLServiceBuilder::buildServiceURI( | |||
181 | } | 184 | } |
182 | else | 185 | else |
183 | { | 186 | { |
184 | llinfos << "Unknown key: " << key << llendl; | 187 | llwarns << "Unknown key: " << key << " in option map: " << LLSDOStreamer<LLSDNotationFormatter>(option_map) << llendl; |
185 | keep_looping = false; | 188 | keep_looping = false; |
186 | } | 189 | } |
187 | break; | 190 | break; |