aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llfloaterassetbrowser.cpp
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--linden/indra/newview/llfloaterassetbrowser.cpp16
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()
63 mTextureAssets.clear(); 63 mTextureAssets.clear();
64 mMaxIndex = 0; 64 mMaxIndex = 0;
65 mFirstIndex = 0; 65 mFirstIndex = 0;
66 mMouseOverIndex = 0; 66 mMouseOverIndex = NULL;
67 mMouseOverUUID = LLUUID::null; 67 mMouseOverUUID = LLUUID::null;
68 mMouseOverAssetUUID = LLUUID::null; 68 mMouseOverAssetUUID = LLUUID::null;
69 mFloaterTitle = ""; 69 mFloaterTitle = "";
@@ -79,7 +79,7 @@ void LLFloaterAssetBrowser::initialize()
79 mAssetInfoIndex = 0; 79 mAssetInfoIndex = 0;
80 mFloaterHeight = getRect().getHeight(); 80 mFloaterHeight = getRect().getHeight();
81 mFloaterWidth = getRect().getWidth(); 81 mFloaterWidth = getRect().getWidth();
82 mMouseOverIndex = 0; 82 mMouseOverIndex = NULL;
83 mMouseOverUUID = LLUUID::null; 83 mMouseOverUUID = LLUUID::null;
84 mMouseOverAssetUUID = LLUUID::null; 84 mMouseOverAssetUUID = LLUUID::null;
85 mFloaterTitle = ""; 85 mFloaterTitle = "";
@@ -131,14 +131,14 @@ void LLFloaterAssetBrowser::createThumbnails()
131 { 131 {
132 mTextureAssets[i].mTexturep = gImageList.getImage(mTextureAssets[i].mAssetUUID, MIPMAP_YES, IMMEDIATE_NO); 132 mTextureAssets[i].mTexturep = gImageList.getImage(mTextureAssets[i].mAssetUUID, MIPMAP_YES, IMMEDIATE_NO);
133 mTextureAssets[i].mTexturep->setBoostLevel(LLViewerImageBoostLevel::BOOST_PREVIEW); 133 mTextureAssets[i].mTexturep->setBoostLevel(LLViewerImageBoostLevel::BOOST_PREVIEW);
134 //mTextureAssets[i].mTexturep->processTextureStats(); 134 mTextureAssets[i].mTexturep->processTextureStats();
135 } 135 }
136 136
137 //Generate the asset info text 137 //Generate the asset info text
138 /*for(S32 i = 0; i < items.count(); i++) 138 for(S32 i = 0; i < items.count(); i++)
139 { 139 {
140 LLString asset_info; 140 std::string asset_info;
141 LLString dimensions; 141 std::string dimensions;
142 142
143 asset_info.append(mTextureAssets[i].mName); 143 asset_info.append(mTextureAssets[i].mName);
144 144
@@ -151,7 +151,7 @@ void LLFloaterAssetBrowser::createThumbnails()
151 asset_info.append(dimensions); 151 asset_info.append(dimensions);
152 152
153 mTextureAssets[i].mAssetInfo = asset_info; 153 mTextureAssets[i].mAssetInfo = asset_info;
154 }*/ 154 }
155 155
156 mFloaterTitle = llformat("Asset Browser (%d assets fetched)", mTextureAssets.size()); 156 mFloaterTitle = llformat("Asset Browser (%d assets fetched)", mTextureAssets.size());
157 setTitle(mFloaterTitle); 157 setTitle(mFloaterTitle);
@@ -288,7 +288,7 @@ void LLFloaterAssetBrowser::draw()
288 if(mImageAssetID.notNull()) 288 if(mImageAssetID.notNull())
289 { 289 {
290 mTexturep = gImageList.getImage(mImageAssetID, MIPMAP_YES, IMMEDIATE_NO); 290 mTexturep = gImageList.getImage(mImageAssetID, MIPMAP_YES, IMMEDIATE_NO);
291 //mTexturep->setBoostLevel(LLViewerImage::BOOST_PREVIEW); 291 mTexturep->setBoostLevel(LLViewerImageBoostLevel::BOOST_PREVIEW);
292 mTexturep->processTextureStats(); 292 mTexturep->processTextureStats();
293 mTextureAssets[i].mWidth = mTexturep->mFullWidth; 293 mTextureAssets[i].mWidth = mTexturep->mFullWidth;
294 mTextureAssets[i].mHeight = mTexturep->mFullHeight; 294 mTextureAssets[i].mHeight = mTexturep->mFullHeight;