From 2e32d44e7165775936beae5d9ef636ff9d3f2bd2 Mon Sep 17 00:00:00 2001 From: Steven Bennetts Date: Tue, 19 Feb 2008 21:42:32 +0000 Subject: merge svn+ssh://svn.lindenlab.com/svn/linden/qa/combo-merge-ui-2008-02-13 -r 79986 : 80178 -> release. QAR-290 = QAR-271 + QAR-191 --- indra/newview/llfloaterlagmeter.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'indra/newview/llfloaterlagmeter.h') diff --git a/indra/newview/llfloaterlagmeter.h b/indra/newview/llfloaterlagmeter.h index 0309f199f7..83603826c4 100644 --- a/indra/newview/llfloaterlagmeter.h +++ b/indra/newview/llfloaterlagmeter.h @@ -74,6 +74,8 @@ private: LLTextBox * mServerText; LLTextBox * mServerCause; + LLString::format_map_t mStringArgs; + static LLFloaterLagMeter * sInstance; }; -- cgit v1.2.3