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/newview/llviewerobject.cpp | |
| parent | 47a3aecc97faa6ecb5267dde4274f0fe417e8409 (diff) | |
| parent | 6b9b4c91d122dccabf7541af70ed68a623ad8810 (diff) | |
Merge lindenlab/viewer-tools-update
Diffstat (limited to 'indra/newview/llviewerobject.cpp')
| -rwxr-xr-x | indra/newview/llviewerobject.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp index 74b8e693c4..a2d9e936d5 100755 --- a/indra/newview/llviewerobject.cpp +++ b/indra/newview/llviewerobject.cpp @@ -3001,7 +3001,7 @@ void LLViewerObject::processTaskInvFile(void** user_data, S32 error_code, LLExtS BOOL LLViewerObject::loadTaskInvFile(const std::string& filename) { std::string filename_and_local_path = gDirUtilp->getExpandedFilename(LL_PATH_CACHE, filename); - llifstream ifs(filename_and_local_path); + std::ifstream ifs(filename_and_local_path.c_str()); if(ifs.good()) { char buffer[MAX_STRING]; /* Flawfinder: ignore */ |