livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Replace apr_file_t with LLAPRFile::tFiletype

Nicky 2013-03-12 17:28:03 +01:00
parent f8828a5296
commit b42e4ae1ad
4 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
indra/CMakeLists.txt
View File

@ -89,10 +89,10 @@ add_subdirectory(${LIBS_OPEN_PREFIX}llplugin)
add_subdirectory(${LIBS_OPEN_PREFIX}llui)
add_subdirectory(${LIBS_OPEN_PREFIX}viewer_components)
if (LL_TESTS OR NOT STANDALONE)
#if (LL_TESTS OR NOT STANDALONE)
# Legacy C++ tests. Build always, run if LL_TESTS is true.
add_subdirectory(${VIEWER_PREFIX}test)
endif (LL_TESTS OR NOT STANDALONE)
#add_subdirectory(${VIEWER_PREFIX}test)
#endif (LL_TESTS OR NOT STANDALONE)
# viewer media plugins
add_subdirectory(${LIBS_OPEN_PREFIX}media_plugins)

2
indra/cmake/00-Common.cmake
View File

@ -159,7 +159,7 @@ if (LINUX)
OUTPUT_STRIP_TRAILING_WHITESPACE)
if (${GXX_VERSION} STREQUAL ${CXX_VERSION})
add_definitions(-D_FORTIFY_SOURCE=2)
# add_definitions(-D_FORTIFY_SOURCE=2)
else (${GXX_VERSION} STREQUAL ${CXX_VERSION})
if (NOT ${GXX_VERSION} MATCHES " 4.1.*Red Hat")
add_definitions(-D_FORTIFY_SOURCE=2)

7
indra/newview/llagent.cpp
View File

@ -4827,7 +4827,12 @@ void LLAgent::dumpSentAppearance(const std::string& dump_prefix)
LLAPRFile outfile;
std::string fullpath = gDirUtilp->getExpandedFilename(LL_PATH_LOGS,outfilename);
outfile.open(fullpath, LL_APR_WB );
apr_file_t* file = outfile.getFileHandle();
// <FS:ND> Remove LLVolatileAPRPool/apr_file_t and use FILE* instead
// apr_file_t* file = outfile.getFileHandle();
LLAPRFile::tFiletype* file = outfile.getFileHandle();
// </FS:ND>
if (!file)
{
return;

12
indra/newview/llvoavatar.cpp
View File

@ -7112,7 +7112,10 @@ bool LLVOAvatar::visualParamWeightsAreDefault()
return rtn;
}
void dump_visual_param(apr_file_t* file, LLVisualParam* viewer_param, F32 value)
// <FS:ND> Remove LLVolatileAPRPool/apr_file_t and use FILE* instead
//void dump_visual_param(apr_file_t* file, LLVisualParam* viewer_param, F32 value)
void dump_visual_param(LLAPRFile::tFiletype* file, LLVisualParam* viewer_param, F32 value)
// </FS:ND>
{
std::string type_string = "unknown";
if (dynamic_cast<LLTexLayerParamAlpha*>(viewer_param))
@ -7150,7 +7153,12 @@ void LLVOAvatar::dumpAppearanceMsgParams( const std::string& dump_prefix,
LLAPRFile outfile;
std::string fullpath = gDirUtilp->getExpandedFilename(LL_PATH_LOGS,outfilename);
outfile.open(fullpath, LL_APR_WB );
apr_file_t* file = outfile.getFileHandle();
// <FS:ND> Remove LLVolatileAPRPool/apr_file_t and use FILE* instead
// apr_file_t* file = outfile.getFileHandle();
LLAPRFile::tFiletype* file = outfile.getFileHandle();
// </FS:ND>
if (!file)
{
return;