aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llappviewer.h
diff options
context:
space:
mode:
Diffstat (limited to 'linden/indra/newview/llappviewer.h')
-rw-r--r--linden/indra/newview/llappviewer.h10
1 files changed, 6 insertions, 4 deletions
diff --git a/linden/indra/newview/llappviewer.h b/linden/indra/newview/llappviewer.h
index 160f2c8..9f9deb6 100644
--- a/linden/indra/newview/llappviewer.h
+++ b/linden/indra/newview/llappviewer.h
@@ -129,10 +129,12 @@ public:
129 std::string getSettingsFileName(const std::string& file); 129 std::string getSettingsFileName(const std::string& file);
130 130
131 // For thread debugging. 131 // For thread debugging.
132 // llstartup needs to control this. 132 // llstartup needs to control init.
133 // llworld, send_agent_pause() also controls this. 133 // llworld, send_agent_pause() also controls pause/resume.
134 void startMainloopTimeout(F32 secs = -1.0f); 134 void initMainloopTimeout(const std::string& state, F32 secs = -1.0f);
135 void stopMainloopTimeout(); 135 void pauseMainloopTimeout();
136 void resumeMainloopTimeout(const std::string& state = "", F32 secs = -1.0f);
137 void pingMainloopTimeout(const std::string& state, F32 secs = -1.0f);
136 138
137protected: 139protected:
138 virtual bool initWindow(); // Initialize the viewer's window. 140 virtual bool initWindow(); // Initialize the viewer's window.