aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llwatchdog.h
diff options
context:
space:
mode:
authorAleric Inglewood2010-11-07 16:55:50 +0100
committerAleric Inglewood2010-11-07 18:27:48 +0100
commit5b4356cefbaa7dbdc8656e7283c110a893b1a89c (patch)
tree43fae9945562c3281746370d623877840ed884b2 /linden/indra/newview/llwatchdog.h
parentIMP-688: ERROR: getString: Invalid string control nick01 (diff)
downloadmeta-impy-5b4356cefbaa7dbdc8656e7283c110a893b1a89c.zip
meta-impy-5b4356cefbaa7dbdc8656e7283c110a893b1a89c.tar.gz
meta-impy-5b4356cefbaa7dbdc8656e7283c110a893b1a89c.tar.bz2
meta-impy-5b4356cefbaa7dbdc8656e7283c110a893b1a89c.tar.xz
IMP-692: SNOW-713: Global objects in libllcommon duplicated in plugins
See http://jira.secondlife.com/browse/SNOW-713 This patch makes llcommon shared. It contains the following snowglobe (SVN) changesets: 3478, 3479, 3480, 3481, 3482, 3485, 3496, 3498, 3500, 3519 and 3531, plus the fix for all rejects. Note that changes to scripts/automated_build_scripts/opensrc-build.sh (changesets 3500 and 3625) were ignored as we don't have scripts/automated_build_scripts.
Diffstat (limited to 'linden/indra/newview/llwatchdog.h')
-rw-r--r--linden/indra/newview/llwatchdog.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/linden/indra/newview/llwatchdog.h b/linden/indra/newview/llwatchdog.h
index ed7d5bd..1a10e33 100644
--- a/linden/indra/newview/llwatchdog.h
+++ b/linden/indra/newview/llwatchdog.h
@@ -64,9 +64,10 @@ public:
64 64
65 /* virtual */ bool isAlive() const; 65 /* virtual */ bool isAlive() const;
66 /* virtual */ void reset(); 66 /* virtual */ void reset();
67 /* virtual */ void start(const std::string& state); 67 /* virtual */ void start() { start(""); };
68 /* virtual */ void stop(); 68 /* virtual */ void stop();
69 69
70 void start(const std::string& state);
70 void setTimeout(F32 d); 71 void setTimeout(F32 d);
71 void ping(const std::string& state); 72 void ping(const std::string& state);
72 const std::string& getState() {return mPingState; } 73 const std::string& getState() {return mPingState; }