Commits

Baker Linden committed 5b83cce Draft

[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)

  • Participants
  • Parent commits 71eaab4

Comments (0)

Files changed (1)

indra/llmessage/llxfermanager.cpp

 				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;