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

Removed some pointless console spewage, and resolved a crash in avatar picks panel.

Browse Source
This commit is contained in:
Shyotl
2012-03-10 20:02:22 -06:00
parent 55e589375f
commit 406ff6872f
3 changed files with 18 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
indra/newview/llinventorybridge.cpp
View File

@@ -598,18 +598,6 @@ void hide_context_entries(LLMenuGL& menu,
// if the first element is a separator, it will not be shown.
bool is_previous_entry_separator = true;
for (menuentry_vec_t::const_iterator itor = entries_to_show.begin(); itor != entries_to_show.end(); ++itor)
{
bool found = false;
for (LLView::child_list_t::const_iterator itor2 = list->begin(); itor2 != list->end(); ++itor2)
{
if(*itor == (*itor2)->getName())
found = true;
}
if(!found)
llinfos << "Failed to find entry '" << *itor << "'" << llendl;
}
for (LLView::child_list_t::const_iterator itor = list->begin();
itor != list->end();
++itor)
@@ -665,7 +653,6 @@ void hide_context_entries(LLMenuGL& menu,
{
enabled &= (*itor2 != name);
}
llinfos << (enabled ? "Showing" : "hiding") << " " << menu_item->getName() << llendl;
menu_item->setEnabled(enabled);
}
}
@@ -1942,12 +1929,6 @@ BOOL LLFolderBridge::dragCategoryIntoFolder(LLInventoryCategory* inv_cat,
is_movable = FALSE;
// tooltip?
}
// Avoid moves that would change nothing
if (is_movable && (mUUID != inv_cat->getParentUUID()))
{
is_movable = FALSE;
// tooltip?
}
LLInventoryModel::cat_array_t descendent_categories;
LLInventoryModel::item_array_t descendent_items;

12
indra/newview/llpanelavatar.cpp
View File

@@ -713,19 +713,19 @@ void LLPanelAvatarWeb::processProperties(void* data, EAvatarProcessorType type)
BOOL LLPanelAvatarClassified::postBuild(void)
{
childSetAction("New...",onClickNew,NULL);
childSetAction("Delete...",onClickDelete,NULL);
childSetAction("New...",onClickNew,this);
childSetAction("Delete...",onClickDelete,this);
return TRUE;
}
BOOL LLPanelAvatarPicks::postBuild(void)
{
childSetAction("New...",onClickNew,NULL);
childSetAction("Delete...",onClickDelete,NULL);
childSetAction("New...",onClickNew,this);
childSetAction("Delete...",onClickDelete,this);
//For pick import and export - RK
childSetAction("Import...",onClickImport,NULL);
childSetAction("Export...",onClickExport,NULL);
childSetAction("Import...",onClickImport,this);
childSetAction("Export...",onClickExport,this);
return TRUE;
}

24
indra/newview/llvoavatar.cpp
View File

@@ -8343,7 +8343,7 @@ void LLVOAvatar::processAvatarAppearance( LLMessageSystem* mesgsys )
// (isTextureDefined(TEX_HAIR_BAKED) ? "HAIR" : "hair " ) << (getTEImage(TEX_HAIR_BAKED)->getID()) << std::endl <<
// (isTextureDefined(TEX_EYES_BAKED) ? "EYES" : "eyes" ) << (getTEImage(TEX_EYES_BAKED)->getID()) << llendl ;
if( !mFirstTEMessageReceived )
if( !is_first_appearance_message )
{
onFirstTEMessageReceived();
}
@@ -8433,19 +8433,19 @@ void LLVOAvatar::processAvatarAppearance( LLMessageSystem* mesgsys )
}
}
while( param && (param->getGroup() != VISUAL_PARAM_GROUP_TWEAKABLE) )
const S32 expected_tweakable_count = getVisualParamCountInGroup(VISUAL_PARAM_GROUP_TWEAKABLE); // don't worry about VISUAL_PARAM_GROUP_TWEAKABLE_NO_TRANSMIT
if (num_blocks != expected_tweakable_count)
{
param = getNextVisualParam();
llinfos << "Number of params in AvatarAppearance msg (" << num_blocks << ") does not match number of tweakable params in avatar xml file (" << expected_tweakable_count << "). Processing what we can. object: " << getID() << llendl;
if(is_first_appearance_message)
{
while( param && (param->getGroup() != VISUAL_PARAM_GROUP_TWEAKABLE) )
param = getNextVisualParam();
if(param && param->getName() == "breast_physics_mass")
llinfos << getFullname() << " does not have avatar physics." << llendl;
}
}
if( param )
{
if(param->getName() == "breast_physics_mass")
llinfos << getFullname() << " does not have avatar physics." << llendl;
else
llwarns << "Number of params in AvatarAppearance msg does not match number of params in avatar xml file for " << getFullname() << " (Prematurely reached end of list at " << param->getName() << ")." << llendl;
//return; //ASC-TTRFE
}
if (params_changed)
{
if (interp_params)