Merge branch 'main' into DRTVWR-588-maint-W

# Conflicts:
#	indra/llui/lltooltip.h
#	indra/newview/llinventoryfunctions.cpp
#	indra/newview/llvovolume.cpp
#	indra/newview/skins/default/textures/textures.xml

3 files changed, 0 insertions, 82 deletions

diff --git a/indra/llappearance/CMakeLists.txt b/indra/llappearance/CMakeLists.txt
index 75c0e276eb..c3be8bc78e 100644
--- a/indra/llappearance/CMakeLists.txt
+++ b/indra/llappearance/CMakeLists.txt
@@ -21,7 +21,6 @@ set(llappearance_SOURCE_FILES
     lltexglobalcolor.cpp
     lltexlayer.cpp
     lltexlayerparams.cpp
-    lltexturemanagerbridge.cpp
     llwearable.cpp
     llwearabledata.cpp
     llwearabletype.cpp
@@ -44,7 +43,6 @@ set(llappearance_HEADER_FILES
     lltexglobalcolor.h
     lltexlayer.h
     lltexlayerparams.h
-    lltexturemanagerbridge.h
     llwearable.h
     llwearabledata.h
     llwearabletype.h
diff --git a/indra/llappearance/lltexturemanagerbridge.cpp b/indra/llappearance/lltexturemanagerbridge.cpp
deleted file mode 100644
index 33f2185e4f..0000000000
--- a/indra/llappearance/lltexturemanagerbridge.cpp
+++ /dev/null
@@ -1,32 +0,0 @@
- /** 
- * @file lltexturemanagerbridge.cpp
- * @brief Defined a null texture manager bridge.  Applications must provide their own bridge implementaton.
- *
- * $LicenseInfo:firstyear=2012&license=viewerlgpl$
- * Second Life Viewer Source Code
- * Copyright (C) 2010, Linden Research, Inc.
- * 
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation;
- * version 2.1 of the License only.
- * 
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- * 
- * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
- * $/LicenseInfo$
- */
-
-#include "lltexturemanagerbridge.h"
-
-// Define a null texture manager bridge.  Applications must provide their own bridge implementaton.
-LLTextureManagerBridge* gTextureManagerBridgep = NULL;
-
-
diff --git a/indra/llappearance/lltexturemanagerbridge.h b/indra/llappearance/lltexturemanagerbridge.h
deleted file mode 100644
index 101704b162..0000000000
--- a/indra/llappearance/lltexturemanagerbridge.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/** 
- * @file lltexturemanagerbridge.h
- * @brief Bridge to an application-specific texture manager.
- *
- * $LicenseInfo:firstyear=2012&license=viewerlgpl$
- * Second Life Viewer Source Code
- * Copyright (C) 2010, Linden Research, Inc.
- * 
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation;
- * version 2.1 of the License only.
- * 
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- * 
- * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
- * $/LicenseInfo$
- */
-
-#ifndef LL_TEXTUREMANAGERBRIDGE_H
-#define LL_TEXTUREMANAGERBRIDGE_H
-
-#include "llavatarappearancedefines.h"
-#include "llpointer.h"
-#include "llgltexture.h"
-
-// Abstract bridge interface
-class LLTextureManagerBridge
-{
-public:
-    virtual ~LLTextureManagerBridge() {}
-
-	virtual LLPointer<LLGLTexture> getLocalTexture(BOOL usemipmaps = TRUE, BOOL generate_gl_tex = TRUE) = 0;
-	virtual LLPointer<LLGLTexture> getLocalTexture(const U32 width, const U32 height, const U8 components, BOOL usemipmaps, BOOL generate_gl_tex = TRUE) = 0;
-	virtual LLGLTexture* getFetchedTexture(const LLUUID &image_id) = 0;
-};
-
-extern LLTextureManagerBridge* gTextureManagerBridgep;
-
-#endif // LL_TEXTUREMANAGERBRIDGE_H
-