diff options
author | McCabe Maxsted | 2010-09-08 17:00:34 -0700 |
---|---|---|
committer | McCabe Maxsted | 2010-09-10 19:09:22 -0700 |
commit | 83e9f753ea2c79fa14e0e91d38eb24edd1ea64dc (patch) | |
tree | 050351fa22ffbd93aa3c5a3485d480a11f5a0064 | |
parent | Made the texture fix cross platform and removed boost::filesystem dep for loa... (diff) | |
download | meta-impy-83e9f753ea2c79fa14e0e91d38eb24edd1ea64dc.zip meta-impy-83e9f753ea2c79fa14e0e91d38eb24edd1ea64dc.tar.gz meta-impy-83e9f753ea2c79fa14e0e91d38eb24edd1ea64dc.tar.bz2 meta-impy-83e9f753ea2c79fa14e0e91d38eb24edd1ea64dc.tar.xz |
Made the local asset texture boost change work on Windows as well
-rw-r--r-- | linden/indra/newview/floaterlocalassetbrowse.cpp | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/linden/indra/newview/floaterlocalassetbrowse.cpp b/linden/indra/newview/floaterlocalassetbrowse.cpp index 0c313fb..6657334 100644 --- a/linden/indra/newview/floaterlocalassetbrowse.cpp +++ b/linden/indra/newview/floaterlocalassetbrowse.cpp | |||
@@ -160,18 +160,19 @@ void LocalBitmap::updateSelf() | |||
160 | if ( !gDirUtilp->fileExists(this->filename) ) { this->linkstatus = LINK_BROKEN; return; } | 160 | if ( !gDirUtilp->fileExists(this->filename) ) { this->linkstatus = LINK_BROKEN; return; } |
161 | 161 | ||
162 | /* exists, let's check if it's lastmod has changed */ | 162 | /* exists, let's check if it's lastmod has changed */ |
163 | std::time_t temp_time; | 163 | #ifdef LL_WINDOWS |
164 | #ifdef LL_DARWIN | 164 | struct _stat temp_stat; |
165 | _stat(this->filename.c_str(), &temp_stat); | ||
166 | #else | ||
165 | struct stat temp_stat; | 167 | struct stat temp_stat; |
166 | stat(this->filename.c_str(), &temp_stat); | 168 | stat(this->filename.c_str(), &temp_stat); |
167 | temp_time = temp_stat.st_mtime; | ||
168 | #else | ||
169 | temp_time = boost::filesystem::last_write_time( boost::filesystem::path( this->filename ) ); | ||
170 | #endif | 169 | #endif |
171 | const std::time_t temp_time = boost::filesystem::last_write_time( boost::filesystem::path( this->filename ) ); | 170 | std::time_t temp_time = temp_stat.st_mtime; |
171 | |||
172 | /*const std::time_t temp_time = boost::filesystem::last_write_time( boost::filesystem::path( this->filename ) ); | ||
172 | llstat temp_stat; | 173 | llstat temp_stat; |
173 | LLFile::stat(this->filename, &temp_stat); | 174 | LLFile::stat(this->filename, &temp_stat); |
174 | std::time_t temp_time = temp_stat.st_mtime; | 175 | std::time_t temp_time = temp_stat.st_mtime;*/ |
175 | 176 | ||
176 | LLSD new_last_modified = asctime( localtime(&temp_time) ); | 177 | LLSD new_last_modified = asctime( localtime(&temp_time) ); |
177 | if ( this->last_modified.asString() == new_last_modified.asString() ) { return; } | 178 | if ( this->last_modified.asString() == new_last_modified.asString() ) { return; } |