Merge branch 'main' into DRTVWR-587-maint-V

# Conflicts:
#	indra/newview/llinventorymodel.cpp
#	indra/newview/llvovolume.cpp

1 files changed, 0 insertions, 32 deletions

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;
-
-