Quitado código del LSL bridge y funciones dependientes

Corrección de errores previos en la migración.
Cambiada la pantalla de inicio (Splash Screen)
This commit is contained in:
2025-05-26 06:28:46 -03:00
parent a5d5fe6288
commit 32da2fd0fb
55 changed files with 1001 additions and 1029 deletions
+1 -6
View File
@@ -87,7 +87,6 @@
#include "aoengine.h"
#include "fsfloaterwearablefavorites.h"
#include "fslslbridge.h"
#ifdef OPENSIM
#include "llviewernetwork.h"
#endif
@@ -1929,8 +1928,6 @@ void LLInventoryModel::changeItemParent(LLViewerInventoryItem* item,
// <FS> Locked folder
if ((isObjectDescendentOf(item->getUUID(), AOEngine::instance().getAOFolder())
&& gSavedPerAccountSettings.getBOOL("LockAOFolders")) ||
(isObjectDescendentOf(item->getUUID(), FSLSLBridge::instance().getBridgeFolder())
&& gSavedPerAccountSettings.getBOOL("LockBridgeFolder")) ||
(isObjectDescendentOf(item->getUUID(), FSFloaterWearableFavorites::getFavoritesFolder())
&& gSavedPerAccountSettings.getBOOL("LockWearableFavoritesFolders")))
{
@@ -1971,8 +1968,6 @@ void LLInventoryModel::changeCategoryParent(LLViewerInventoryCategory* cat,
// <FS> Protected folder
if ((isObjectDescendentOf(cat->getUUID(), AOEngine::instance().getAOFolder())
&& gSavedPerAccountSettings.getBOOL("LockAOFolders")) ||
(isObjectDescendentOf(cat->getUUID(), FSLSLBridge::instance().getBridgeFolder())
&& gSavedPerAccountSettings.getBOOL("LockBridgeFolder")) ||
(isObjectDescendentOf(cat->getUUID(), FSFloaterWearableFavorites::getFavoritesFolder())
&& gSavedPerAccountSettings.getBOOL("LockWearableFavoritesFolders")))
{
@@ -4806,7 +4801,7 @@ void LLInventoryModel::wearAttachmentsOnAvatarCheckRemove(LLViewerObject *object
}
}
if (!isFound && att_id != FSLSLBridge::instance().getAttachedID())
if (!isFound)
{
items_to_detach.push_back(att_id);
}