merge up to 3.3.3-release

1 files changed, 0 insertions, 6 deletions

diff --git a/indra/newview/llappviewer.h b/indra/newview/llappviewer.h
index 4f3160f7c1..a796165668 100644
--- a/indra/newview/llappviewer.h
+++ b/indra/newview/llappviewer.h
@@ -56,8 +56,6 @@ class LLTextureFetch;
 class LLWatchdogTimeout;
 class LLUpdaterService;
 
-struct apr_dso_handle_t;
-
 class LLAppViewer : public LLApp
 {
 public:
@@ -235,8 +233,6 @@ private:
 
     void sendLogoutRequest();
     void disconnectViewer();
-
-	void loadEventHostModule(S32 listen_port);
 	
 	// *FIX: the app viewer class should be some sort of singleton, no?
 	// Perhaps its child class is the singleton and this should be an abstract base.
@@ -285,8 +281,6 @@ private:
 
     LLAllocator mAlloc;
 
-	std::set<struct apr_dso_handle_t*> mPlugins;
-
 	LLFrameTimer mMemCheckTimer;
 	
 	boost::scoped_ptr<LLUpdaterService> mUpdater;