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:
@@ -1724,11 +1724,6 @@ BOOL LLItemBridge::renameItem(const std::string& new_name)
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
void LLItemBridge::descriptionChanged(void) const
|
||||
{
|
||||
// Nothing to do.
|
||||
}
|
||||
|
||||
BOOL LLItemBridge::removeItem()
|
||||
{
|
||||
if(!isItemRemovable())
|
||||
@@ -2970,12 +2965,6 @@ BOOL LLFolderBridge::renameItem(const std::string& new_name)
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
void LLFolderBridge::descriptionChanged(void) const
|
||||
{
|
||||
// A folder has no description.
|
||||
llerrs << "Calling LLFolderBridge::descriptionChanged" << llendl;
|
||||
}
|
||||
|
||||
BOOL LLFolderBridge::removeItem()
|
||||
{
|
||||
if(!isItemRemovable())
|
||||
@@ -5480,11 +5469,6 @@ BOOL LLObjectBridge::renameItem(const std::string& new_name)
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
void LLObjectBridge::descriptionChanged(void) const
|
||||
{
|
||||
// Nothing to do.
|
||||
}
|
||||
|
||||
// +=================================================+
|
||||
// | LLLSLTextBridge |
|
||||
// +=================================================+
|
||||
@@ -5643,11 +5627,11 @@ BOOL LLWearableBridge::renameItem(const std::string& new_name)
|
||||
return LLItemBridge::renameItem(new_name);
|
||||
}
|
||||
|
||||
void LLWearableBridge::descriptionChanged(void) const
|
||||
void LLWearableBridge::nameOrDescriptionChanged(void) const
|
||||
{
|
||||
if (get_is_item_worn(mUUID))
|
||||
{
|
||||
gAgentWearables.descriptionChanged(mUUID);
|
||||
gAgentWearables.nameOrDescriptionChanged(mUUID);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user