Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Tweaks twEaks tWEaks tweAKs aaaa

Browse Source 
Fixes for Linux issues, fixes for menu issues, fixes for content issues, fixes for texture display issues. I think that's everything.

Signed-off-by: Beeks <HgDelirium@gmail.com>
This commit is contained in:
Beeks
2010-08-27 06:04:16 -04:00
parent 27dbe74066
commit 23e71a8b4f
6 changed files with 160 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
indra/newview/llviewermenu.cpp
View File

@@ -6980,11 +6980,6 @@ void handle_selected_texture_info(void*)
map_t::iterator it;
for (it = faces_per_texture.begin(); it != faces_per_texture.end(); ++it)
{
LLUUID image_id = it->first;
// <edit>
std::string uuid_str;
image_id.toString(uuid_str);
// </edit>
U8 te = it->second[0];
LLViewerImage* img = node->getObject()->getTEImage(te);
S32 height = img->getHeight();
@@ -6992,9 +6987,7 @@ void handle_selected_texture_info(void*)
S32 components = img->getComponents();
// <edit>
//msg = llformat("%dx%d %s on face ",
msg = llformat("%s, %dx%d %s on face ",
uuid_str.c_str(),
// </edit>
msg = llformat("%dx%d %s on face ",
width,
height,
(components == 4 ? "alpha" : "opaque"));
@@ -7005,38 +6998,12 @@ void handle_selected_texture_info(void*)
LLChat chat(msg);
LLFloaterChat::addChat(chat);
}
// <edit>
if(node->getObject()->isSculpted())
{
LLSculptParams *sculpt_params = (LLSculptParams *)(node->getObject()->getParameterEntry(LLNetworkData::PARAMS_SCULPT));
LLUUID sculpt_id = sculpt_params->getSculptTexture();
std::string uuid_str;
sculpt_id.toString(uuid_str);
msg.assign("Sculpt texture: ");
msg.append(uuid_str.c_str());
LLChat chat(msg);
LLFloaterChat::addChat(chat);
unique_textures[sculpt_id] = true;
}
if(node->getObject()->isParticleSource())
{
//LLUUID particle_id = node->getObject()->mPartSourcep->getImage()->getID();
}
// </edit>
}
// <edit>
typedef std::map<LLUUID, bool>::iterator map_iter;
for(map_iter i = unique_textures.begin(); i != unique_textures.end(); ++i)
{
LLUUID asset_id = (*i).first;
LLLocalInventory::addItem(asset_id.asString(), (int)LLAssetType::AT_TEXTURE, asset_id, true);
}
// Show total widthxheight
F32 memoriez = (F32)total_memory;
memoriez = memoriez / 1000000;
std::string msg = llformat("Total uncompressed: %f MB", memoriez);
F32 memory = (F32)total_memory;
memory = memory / 1000000;
std::string msg = llformat("Total uncompressed: %f MB", memory);
LLChat chat(msg);
LLFloaterChat::addChat(chat);
// </edit>