Merge remote branch 'elektra/weekly' into weekly

3 files changed, 14 insertions, 13 deletions

diff --git a/linden/indra/llwindow/llwindowmacosx.cpp b/linden/indra/llwindow/llwindowmacosx.cpp
index 613d147..7e7e0af 100644
--- a/linden/indra/llwindow/llwindowmacosx.cpp
+++ b/linden/indra/llwindow/llwindowmacosx.cpp
@@ -3194,7 +3194,6 @@ void LLWindowMacOSX::spawnWebBrowser(const std::string& escaped_url)
         }
 }
 
-
 BOOL LLWindowMacOSX::dialog_color_picker ( F32 *r, F32 *g, F32 *b)
 {
         BOOL    retval = FALSE;
diff --git a/linden/indra/newview/floaterlocalassetbrowse.cpp b/linden/indra/newview/floaterlocalassetbrowse.cpp
index 6657334..6564528 100644
--- a/linden/indra/newview/floaterlocalassetbrowse.cpp
+++ b/linden/indra/newview/floaterlocalassetbrowse.cpp
@@ -117,15 +117,21 @@ LocalBitmap::LocalBitmap(std::string fullpath)
                 else if (temp_exten == "jpg" || temp_exten == "jpeg") { this->extension = IMG_EXTEN_JPG; }
                 else if (temp_exten == "png") { this->extension = IMG_EXTEN_PNG; }
                 else { return; } // no valid extension.
-                
+
                 /* getting file's last modified */
 
-                llstat temp_stat;
-                LLFile::stat(this->filename, &temp_stat);
+#ifdef LL_WINDOWS
+                struct _stat temp_stat;
+                _stat(this->filename.c_str(), &temp_stat);
+#else
+                struct stat temp_stat;
+                stat(this->filename.c_str(), &temp_stat);
+#endif
+
                 std::time_t time = temp_stat.st_mtime;
 
                 this->last_modified = asctime( localtime(&time) );
-                
+
                 /* checking if the bitmap is valid && decoding if it is */
                 LLImageRaw* raw_image = new LLImageRaw();
                 if ( this->decodeSelf(raw_image) )
@@ -160,6 +166,7 @@ void LocalBitmap::updateSelf()
                 if ( !gDirUtilp->fileExists(this->filename) ) { this->linkstatus = LINK_BROKEN; return; }
 
                 /* exists, let's check if it's lastmod has changed */
+
 #ifdef LL_WINDOWS
                 struct _stat temp_stat;
                 _stat(this->filename.c_str(), &temp_stat);
@@ -169,11 +176,6 @@ void LocalBitmap::updateSelf()
 #endif
                 std::time_t temp_time = temp_stat.st_mtime;
 
-                /*const std::time_t temp_time = boost::filesystem::last_write_time( boost::filesystem::path( this->filename ) );
-                llstat temp_stat;
-                LLFile::stat(this->filename, &temp_stat);
-                std::time_t temp_time = temp_stat.st_mtime;*/
-
                 LLSD new_last_modified = asctime( localtime(&temp_time) );
                 if ( this->last_modified.asString() == new_last_modified.asString() ) { return; }
 
@@ -475,11 +477,11 @@ void LocalAssetBrowser::AddBitmap()
                 LocalBitmap* unit = new LocalBitmap( filename );
 
                 if      ( unit->getIfValidBool() )
-                { 
+                {
                         loaded_bitmaps.push_back( unit ); 
                         change_happened = true;
                 }
-        
+
                 filename = picker.getNextFile();
         }
 
diff --git a/linden/indra/newview/llimview.cpp b/linden/indra/newview/llimview.cpp
index b5b1df2..12a26f9 100644
--- a/linden/indra/newview/llimview.cpp
+++ b/linden/indra/newview/llimview.cpp
@@ -692,7 +692,7 @@ void LLIMMgr::addMessage(
                 else
                         new_line = new_line.substr(1);
 
-                color = get_extended_text_color(session_id, other_participant_id, msg, gSavedSettings.getColor("IMChatColor"));
+                color = get_extended_text_color(session_id, other_participant_id, new_line, gSavedSettings.getColor("IMChatColor"));
         }
 
         if ( !link_name )