Damian/Puma_Viewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Quitado código del LSL bridge y funciones dependientes

Browse Source 
Corrección de errores previos en la migración.
Cambiada la pantalla de inicio (Splash Screen)
This commit is contained in:
Damian
2025-05-26 06:28:46 -03:00
parent a5d5fe6288
commit 32da2fd0fb
55 changed files with 1001 additions and 1029 deletions
Download Patch File Download Diff File Expand all files Collapse all files
indra/newview/llappearancemgr.cpp
-91
View File
@@ -73,8 +73,6 @@
#include "rlvlocks.h"
// [/RLVa:KB]
#include "fslslbridge.h"
namespace
{
const S32 BAKE_RETRY_MAX_COUNT = 5;
@@ -1758,23 +1756,6 @@ void LLAppearanceMgr::takeOffOutfit(const LLUUID& cat_id)
gInventory.collectDescendentsIf(cat_id, cats, items, false, collector);
// <FS:TT> Client LSL Bridge
if (FSLSLBridge::instance().canUseBridge())
{
LL_INFOS("FSLSLBridge") << "reinserting bridge at outfit remove" << LL_ENDL;
for (LLInventoryModel::item_array_t::iterator i = items.begin(); i != items.end(); ++i)
{
const LLViewerInventoryItem* item = *i;
if (item->getName() == FSLSLBridge::instance().currentFullName())
{
items.erase(i);
break;
}
}
}
// </FS:TT>
LLInventoryModel::item_array_t::const_iterator it = items.begin();
const LLInventoryModel::item_array_t::const_iterator it_end = items.end();
uuid_vec_t uuids_to_remove;
@@ -1860,13 +1841,6 @@ void LLAppearanceMgr::slamCategoryLinks(const LLUUID& src_id, const LLUUID& dst_
{
const LLViewerInventoryItem* item = (*iter);
// <FS:Ansariel> Don't add LSL bridge to outfit
if (item->getName() == FSLSLBridge::instance().currentFullName())
{
continue;
}
// </FS:Ansariel>
switch (item->getActualType())
{
case LLAssetType::AT_LINK:
@@ -1920,12 +1894,6 @@ void LLAppearanceMgr::shallowCopyCategoryContents(const LLUUID& src_id, const LL
++iter)
{
const LLViewerInventoryItem* item = (*iter);
// <FS:Ansariel> Skip LSL bridge
if (item->getName() == FSLSLBridge::instance().currentFullName())
{
continue;
}
// </FS:Ansariel>
switch (item->getActualType())
{
case LLAssetType::AT_LINK:
@@ -2341,19 +2309,6 @@ void LLAppearanceMgr::updateCOF(LLInventoryModel::item_array_t& body_items_new,
obj_items.insert(obj_items.end(), obj_items_new.begin(), obj_items_new.end());
// [/RLVa:KB]
// <FS:TT> Client LSL Bridge
if (FSLSLBridge::instance().canUseBridge())
{
//if replacing - make sure bridge stays.
if (!append && FSLSLBridge::instance().getBridge())
{
LL_INFOS("FSLSLBridge") << "Reinserting bridge at outfit replace" << LL_ENDL;
obj_items.insert(obj_items.end(), FSLSLBridge::instance().getBridge());
LL_INFOS("FSLSLBridge") << "Bridge reinserted" << LL_ENDL;
}
}
// </FS:TT>
removeDuplicateItems(obj_items);
// - Gestures: include COF contents only if appending.
@@ -2781,19 +2736,6 @@ void LLAppearanceMgr::updateAppearanceFromCOF(bool enforce_item_restrictions,
LLInventoryModel::item_array_t cof_item_array;
get_sorted_base_and_cof_items(cof_item_array, outfit_item_array);
// <FS:Ansariel> Exclude LSL bridge or the following size check will always fail!
for (LLInventoryModel::item_array_t::iterator i = cof_item_array.begin(); i != cof_item_array.end(); ++i)
{
LLViewerInventoryItem *item = *i;
if (FSLSLBridge::instance().isBridgeValid() && item && item->getLinkedUUID() == FSLSLBridge::instance().getBridge()->getUUID())
{
cof_item_array.erase(i);
break;
}
}
// </FS:Ansariel>
if (outfit_item_array.size() == cof_item_array.size())
{
for (U32 i = 0; i < cof_item_array.size(); ++i)
@@ -3561,19 +3503,6 @@ void LLAppearanceMgr::updateIsDirty()
}
}
// <FS:TS> FIRE-3018: Ignore the bridge when checking for dirty.
for (LLInventoryModel::item_array_t::iterator i = cof_items.begin(); i != cof_items.end(); ++i)
{
LLViewerInventoryItem *item = *i;
if (FSLSLBridge::instance().isBridgeValid() && item && item->getLinkedUUID() == FSLSLBridge::instance().getBridge()->getUUID())
{
cof_items.erase( i );
break;
}
}
// </FS:TS>
if(outfit_items.size() != cof_items.size())
{
LL_DEBUGS("Avatar") << "item count different - base " << outfit_items.size() << " cof " << cof_items.size() << LL_ENDL;
@@ -3798,19 +3727,6 @@ void update_base_outfit_after_ordering()
}
}
// <FS:Ansariel> Exclude LSL bridge or the following size check will always fail!
for (LLInventoryModel::item_array_t::iterator i = cof_item_array.begin(); i != cof_item_array.end(); ++i)
{
LLViewerInventoryItem *item = *i;
if (FSLSLBridge::instance().isBridgeValid() && item && item->getLinkedUUID() == FSLSLBridge::instance().getBridge()->getUUID())
{
cof_item_array.erase(i);
break;
}
}
// </FS:Ansariel>
if (outfit_item_array.size() != cof_item_array.size())
{
return;
@@ -4583,13 +4499,6 @@ void LLAppearanceMgr::removeItemsFromAvatar(const uuid_vec_t& ids_to_remove, nul
continue;
}
// <FS:Ansariel> LSL Bridge
if (FSLSLBridge::instance().canUseBridge() && linked_item_id == FSLSLBridge::instance().getBridge()->getUUID())
{
continue;
}
// </FS:Ansariel>
LLViewerInventoryItem *item = gInventory.getItem(linked_item_id);
if (item && item->getType() == LLAssetType::AT_OBJECT)
{