diff options
author | Merov Linden <merov@lindenlab.com> | 2015-04-09 16:51:02 -0700 |
---|---|---|
committer | Merov Linden <merov@lindenlab.com> | 2015-04-09 16:51:02 -0700 |
commit | 8952e8177528fe0eee65916b9e12c3183f15e392 (patch) | |
tree | 3625cecb6fd90bf0de23021c22b5d805527af131 /indra/llmessage/llservicebuilder.cpp | |
parent | 47a3aecc97faa6ecb5267dde4274f0fe417e8409 (diff) | |
parent | 6b9b4c91d122dccabf7541af70ed68a623ad8810 (diff) |
Merge lindenlab/viewer-tools-update
Diffstat (limited to 'indra/llmessage/llservicebuilder.cpp')
-rwxr-xr-x | indra/llmessage/llservicebuilder.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llmessage/llservicebuilder.cpp b/indra/llmessage/llservicebuilder.cpp index 392e7f1091..34ab891830 100755 --- a/indra/llmessage/llservicebuilder.cpp +++ b/indra/llmessage/llservicebuilder.cpp @@ -34,7 +34,7 @@ void LLServiceBuilder::loadServiceDefinitionsFromFile( const std::string& service_filename) { - llifstream service_file(service_filename, std::ios::binary); + std::ifstream service_file(service_filename.c_str(), std::ios::binary); if(service_file.is_open()) { LLSD service_data; |