merge with El Capitan and packaging fixes

1 files changed, 0 insertions, 51 deletions

diff --git a/indra/lscript/llscriptresourcepool.h b/indra/lscript/llscriptresourcepool.h
deleted file mode 100755
index 4ea2556e0f..0000000000
--- a/indra/lscript/llscriptresourcepool.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/** 
- * @file llscriptresourcepool.h
- * @brief A collection of LLScriptResources
- *
- * $LicenseInfo:firstyear=2008&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_LLSCRIPTRESOURCEPOOL_H
-#define LL_LLSCRIPTRESOURCEPOOL_H
-
-#include "llscriptresource.h"
-
-// This is just a holder for LLSimResources
-class LLScriptResourcePool
-{
-public:	
-	LLScriptResourcePool();
-	// ~LLSimResourceMgr();
-
-	LLScriptResource& getPublicURLResource();
-	const LLScriptResource& getPublicURLResource() const;
-
-	// An empty resource pool.
-	static LLScriptResourcePool null;
-
-private:
-	LLScriptResource mLSLPublicURLs;
-};
-
-
-
-#endif