summaryrefslogtreecommitdiff
path: root/indra/newview/llimpanel.cpp
diff options
context:
space:
mode:
authorSteven Bennetts <steve@lindenlab.com>2009-08-18 16:54:34 +0000
committerSteven Bennetts <steve@lindenlab.com>2009-08-18 16:54:34 +0000
commit0710d0da2ba0d4c0fe66b890f1598d8df7ea4917 (patch)
treecb9323d21b0316a5c2cdfa9143b7f4355c6188f1 /indra/newview/llimpanel.cpp
parentac1b723fd79b63a9dab94c839d3c0acb2ddde129 (diff)
merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1378 https://svn.aws.productengine.com/secondlife/pe/stable-1@1386 -> viewer-2.0.0-3
EXT-357 EXT-370 EXT-385 EXT-409 EXT-472 EXT-479 EXT-513 EXT-532 EXT-541 EXT-544 EXT-546
Diffstat (limited to 'indra/newview/llimpanel.cpp')
-rw-r--r--indra/newview/llimpanel.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/llimpanel.cpp b/indra/newview/llimpanel.cpp
index 1037ef0403..65bf1176ff 100644
--- a/indra/newview/llimpanel.cpp
+++ b/indra/newview/llimpanel.cpp
@@ -2231,6 +2231,12 @@ LLIMFloater* LLIMFloater::show(const LLUUID& session_id)
return floater;
}
+//static
+BOOL LLIMFloater::toggle(const LLUUID& session_id)
+{
+ return LLFloaterReg::toggleInstance("impanel", session_id);
+}
+
void LLIMFloater::updateMessages()
{
std::list<LLSD> messages = LLIMModel::instance().getMessages(mSessionID, mLastMessageIndex+1);