From b0c449d301299a4ba1b7d83e930f9df6b071b931 Mon Sep 17 00:00:00 2001 From: Baker Linden Date: Wed, 9 Jan 2013 15:24:27 -0800 Subject: [MAINT-2185] Unable to upload terrain .raw files - Fixed an issue where a slash was prepended to the beginning of the filename (which happened to be the full path) --- indra/llmessage/llxfermanager.cpp | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/indra/llmessage/llxfermanager.cpp b/indra/llmessage/llxfermanager.cpp index b9cddc8e45..00b9d81611 100644 --- a/indra/llmessage/llxfermanager.cpp +++ b/indra/llmessage/llxfermanager.cpp @@ -886,8 +886,17 @@ void LLXferManager::processFileRequest (LLMessageSystem *mesgsys, void ** /*user return; } - - std::string expanded_filename = gDirUtilp->getExpandedFilename( local_path, local_filename ); + // If we want to use a special path (e.g. LL_PATH_CACHE), we want to make sure we create the + // proper expanded filename. + std::string expanded_filename; + if (local_path != LL_PATH_NONE) + { + expanded_filename = gDirUtilp->getExpandedFilename( local_path, local_filename ); + } + else + { + expanded_filename = local_filename; + } llinfos << "starting file transfer: " << expanded_filename << " to " << mesgsys->getSender() << llendl; BOOL delete_local_on_completion = FALSE; -- cgit v1.2.3 From bc522d6ba2aaeffff451533dabf2757c6e641ce1 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Thu, 10 Jan 2013 14:42:36 -0500 Subject: tag merge of DRTVWR-279 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 9a0da76384..13e1e96287 100644 --- a/.hgtags +++ b/.hgtags @@ -398,3 +398,4 @@ c374035d459af3c03dea2dd90880dfc25de64706 DRTVWR-275 7c6dfdc1b7a2ce0d8e3a8f3ce3058547ea065c0f DRTVWR-250 b9ff9730daa53a541925300cbd02bb14575a5705 DRTVWR-277 af6b711a97073431953b55ee808aaa09900c27e5 DRTVWR-276 +8302fefde6c8f4a64bfc7f04929f8bc85f5c6c7b DRTVWR-279 -- cgit v1.2.3