Bug fix: circumvent using LLs notify system.

Can't use LLs LLFolderViewItem::rename from
LLInventoryPanel::modelChanged because it's nonrobust spaghetti code
and causes randomly sized loops.

Also cleaned up the number of unused nameOrDescriptionChanged functions
introduced in a previous commit.
This commit is contained in:
Aleric Inglewood
2013-07-20 18:28:52 +02:00
parent 7162214c01
commit 85ff52be30
10 changed files with 33 additions and 63 deletions

View File

@@ -933,12 +933,7 @@ void LLPanelEditWearable::setWearableIndex(S32 index)
LLViewerWearable* wearable = gAgentWearables.getViewerWearable(mType,mCurrentIndex);
if(wearable == getWearable())
return;
mCurrentWearable = wearable;
// Singu note: Set title even if the wearable didn't change: the name might have changed (when renamed).
if(wearable)
{
childSetTextArg("title", "[DESC]", wearable->getName() );
@@ -950,6 +945,11 @@ void LLPanelEditWearable::setWearableIndex(S32 index)
childSetTextArg("title_no_modify", "[DESC]", std::string(LLWearableType::getTypeLabel( mType )));
}
if(wearable == getWearable())
return;
mCurrentWearable = wearable;
if(mActiveModal)
mActiveModal->close();