summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterchat.h
diff options
context:
space:
mode:
authorRichard Nelson <richard@lindenlab.com>2009-08-04 01:12:59 +0000
committerRichard Nelson <richard@lindenlab.com>2009-08-04 01:12:59 +0000
commiteb853f55c07ae4a3c3f2aa05fbabcf2e4b4dc115 (patch)
tree7707fccb8d0946b6257d5ed7c5dfd3941c53eec0 /indra/newview/llfloaterchat.h
parentdb5cda26676f376f18816013c0c5e3fbad5b20d0 (diff)
svn merge -r 128442:129343 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-18 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3
Diffstat (limited to 'indra/newview/llfloaterchat.h')
-rw-r--r--indra/newview/llfloaterchat.h6
1 files changed, 2 insertions, 4 deletions
diff --git a/indra/newview/llfloaterchat.h b/indra/newview/llfloaterchat.h
index b299d1ad10..e8af48d095 100644
--- a/indra/newview/llfloaterchat.h
+++ b/indra/newview/llfloaterchat.h
@@ -65,12 +65,9 @@ public:
LLFloaterChat(const LLSD& seed);
~LLFloaterChat();
- virtual void setVisible( BOOL b );
virtual void draw();
virtual BOOL postBuild();
- virtual void onClose(bool app_quitting);
- virtual void onVisibilityChange(BOOL cur_visibility);
- virtual void setMinimized(BOOL);
+
void updateConsoleVisibility();
static void setHistoryCursorAndScrollToEnd();
@@ -90,6 +87,7 @@ public:
static void chatFromLogFile(LLLogChat::ELogLineType type,std::string line, void* userdata);
static void loadHistory();
static void* createSpeakersPanel(void* data);
+ static void* createChatPanel(void* data);
static LLFloaterChat* getInstance(); // *TODO:Skinning Deprecate