Merge branch 'mccabe-plugins' into plugins_merge

Conflicts:
	linden/doc/contributions.txt
	linden/indra/cmake/GStreamer.cmake
	linden/indra/cmake/LLMedia.cmake
	linden/indra/cmake/OPENAL.cmake
	linden/indra/llmedia/CMakeLists.txt
	linden/indra/llprimitive/material_codes.h
	linden/indra/newview/chatbar_as_cmdline.cpp
	linden/indra/newview/llappviewer.cpp
	linden/indra/newview/llfloatertos.cpp
	linden/indra/newview/llstartup.cpp
	linden/indra/newview/llviewerwindow.cpp
	linden/indra/newview/llvoavatar.cpp
	linden/indra/newview/pipeline.cpp
	linden/indra/newview/pipeline.h
	linden/indra/newview/viewer_manifest.py
	linden/install.xml

1 files changed, 8 insertions, 8 deletions

diff --git a/linden/indra/newview/llfloaterassetbrowser.cpp b/linden/indra/newview/llfloaterassetbrowser.cpp
index af81c4a..ca0e8d1 100644
--- a/linden/indra/newview/llfloaterassetbrowser.cpp
+++ b/linden/indra/newview/llfloaterassetbrowser.cpp
@@ -63,7 +63,7 @@ LLFloaterAssetBrowser::~LLFloaterAssetBrowser()
         mTextureAssets.clear();
         mMaxIndex = 0;
         mFirstIndex = 0;
-        mMouseOverIndex = 0;
+        mMouseOverIndex = NULL;
         mMouseOverUUID = LLUUID::null;
         mMouseOverAssetUUID = LLUUID::null;
         mFloaterTitle = "";
@@ -79,7 +79,7 @@ void LLFloaterAssetBrowser::initialize()
         mAssetInfoIndex = 0;
         mFloaterHeight = getRect().getHeight();
         mFloaterWidth = getRect().getWidth();
-        mMouseOverIndex = 0;
+        mMouseOverIndex = NULL;
         mMouseOverUUID = LLUUID::null;
         mMouseOverAssetUUID = LLUUID::null;
         mFloaterTitle = "";
@@ -131,14 +131,14 @@ void LLFloaterAssetBrowser::createThumbnails()
         {
                         mTextureAssets[i].mTexturep = gImageList.getImage(mTextureAssets[i].mAssetUUID, MIPMAP_YES, IMMEDIATE_NO);
                         mTextureAssets[i].mTexturep->setBoostLevel(LLViewerImageBoostLevel::BOOST_PREVIEW);
-                        //mTextureAssets[i].mTexturep->processTextureStats();
+                        mTextureAssets[i].mTexturep->processTextureStats();
         }
 
         //Generate the asset info text
-        /*for(S32 i = 0; i < items.count(); i++)
+        for(S32 i = 0; i < items.count(); i++)
         {
-                LLString asset_info;
-                LLString dimensions;
+                std::string asset_info;
+                std::string dimensions;
                 
                 asset_info.append(mTextureAssets[i].mName);
                 
@@ -151,7 +151,7 @@ void LLFloaterAssetBrowser::createThumbnails()
                 asset_info.append(dimensions);
                 
                 mTextureAssets[i].mAssetInfo = asset_info;
-        }*/
+        }
         
         mFloaterTitle = llformat("Asset Browser (%d assets fetched)", mTextureAssets.size());
         setTitle(mFloaterTitle);
@@ -288,7 +288,7 @@ void LLFloaterAssetBrowser::draw()
                                 if(mImageAssetID.notNull())
                                 {
                                         mTexturep = gImageList.getImage(mImageAssetID, MIPMAP_YES, IMMEDIATE_NO);
-                                        //mTexturep->setBoostLevel(LLViewerImage::BOOST_PREVIEW);
+                                        mTexturep->setBoostLevel(LLViewerImageBoostLevel::BOOST_PREVIEW);
                                         mTexturep->processTextureStats();
                                         mTextureAssets[i].mWidth = mTexturep->mFullWidth;
                                         mTextureAssets[i].mHeight = mTexturep->mFullHeight;