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:
@@ -90,7 +90,6 @@
|
||||
#include "rlvlocks.h"
|
||||
// [/RLVa:KB]
|
||||
// <FS:TT> Client LSL Bridge
|
||||
#include "fslslbridge.h"
|
||||
#include "aoengine.h"
|
||||
// </FS:TT>
|
||||
|
||||
@@ -1464,13 +1463,6 @@ bool LLInvFVBridge::isLockedFolder(bool ignore_setting /*= false*/) const
|
||||
return false;
|
||||
}
|
||||
|
||||
if ((mUUID == FSLSLBridge::instance().getBridgeFolder()
|
||||
|| model->isObjectDescendentOf(mUUID, FSLSLBridge::instance().getBridgeFolder()))
|
||||
&& (gSavedPerAccountSettings.getBOOL("LockBridgeFolder") || ignore_setting))
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
if ((mUUID == AOEngine::instance().getAOFolder()
|
||||
|| model->isObjectDescendentOf(mUUID, AOEngine::instance().getAOFolder()))
|
||||
&& (gSavedPerAccountSettings.getBOOL("LockAOFolders") || ignore_setting))
|
||||
@@ -6532,7 +6524,6 @@ bool LLFolderBridge::isLocked() const
|
||||
static LLCachedControl<bool> LockWearableFavoritesFolders(gSavedPerAccountSettings, "LockWearableFavoritesFolders");
|
||||
|
||||
return ((mUUID == AOEngine::instance().getAOFolder() && LockAOFolders) ||
|
||||
(mUUID == FSLSLBridge::instance().getBridgeFolder() && LockBridgeFolder) ||
|
||||
(mUUID == FSFloaterWearableFavorites::getFavoritesFolder() && LockWearableFavoritesFolders));
|
||||
}
|
||||
// </FS:Ansariel>
|
||||
|
||||
Reference in New Issue
Block a user