summaryrefslogtreecommitdiff
path: root/indra/newview/llappviewer.h
diff options
context:
space:
mode:
authorTodd Stinson <stinson@lindenlab.com>2012-06-22 18:59:31 -0700
committerTodd Stinson <stinson@lindenlab.com>2012-06-22 18:59:31 -0700
commit6e710333e7ea08a79c401ae54d063d8ef608f99a (patch)
treeff0dbcf29032ff9da18c8d86be7dd622ed180583 /indra/newview/llappviewer.h
parent7cc44fb7fe40706e2017343d76ed226f477dad8d (diff)
parent90547ff411db177bf6424ca553449a81a808fc0f (diff)
Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-release.
Diffstat (limited to 'indra/newview/llappviewer.h')
-rw-r--r--indra/newview/llappviewer.h6
1 files changed, 0 insertions, 6 deletions
diff --git a/indra/newview/llappviewer.h b/indra/newview/llappviewer.h
index 71a7868191..f7d019ccba 100644
--- a/indra/newview/llappviewer.h
+++ b/indra/newview/llappviewer.h
@@ -41,8 +41,6 @@ class LLTextureFetch;
class LLWatchdogTimeout;
class LLUpdaterService;
-struct apr_dso_handle_t;
-
class LLAppViewer : public LLApp
{
public:
@@ -220,8 +218,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.
@@ -270,8 +266,6 @@ private:
LLAllocator mAlloc;
- std::set<struct apr_dso_handle_t*> mPlugins;
-
LLFrameTimer mMemCheckTimer;
boost::scoped_ptr<LLUpdaterService> mUpdater;