summaryrefslogtreecommitdiff
path: root/indra/newview/llnearbychat.h
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2012-11-03 20:44:00 -0700
committerMerov Linden <merov@lindenlab.com>2012-11-03 20:44:00 -0700
commit7c7cc56b037f05f148a7215d0c5f567989a0c012 (patch)
tree11afb3864d36de63ccd2b1dffa7ba2daebd82e9f /indra/newview/llnearbychat.h
parentb6ad7db0d61033425a4f65270731023afe74ecce (diff)
parent3b39ec165aa837d02bf1bf57ff8f3aab3229659c (diff)
Pull merge from richard/viewer-chui
Diffstat (limited to 'indra/newview/llnearbychat.h')
-rw-r--r--indra/newview/llnearbychat.h5
1 files changed, 1 insertions, 4 deletions
diff --git a/indra/newview/llnearbychat.h b/indra/newview/llnearbychat.h
index 7ada4daea8..b155fd3c26 100644
--- a/indra/newview/llnearbychat.h
+++ b/indra/newview/llnearbychat.h
@@ -53,7 +53,7 @@ public:
/*virtual*/ BOOL postBuild();
/*virtual*/ void onOpen(const LLSD& key);
/*virtual*/ void setFocus(BOOL focusFlag);
- /*virtual*/ void setVisible(BOOL visible);
+ /*virtual*/ void setVisible(BOOL visible);
void loadHistory();
void reloadMessages();
@@ -78,8 +78,6 @@ public:
static void startChat(const char* line);
static void stopChat();
- bool isHostSet();
-
static void sendChatFromViewer(const std::string &utf8text, EChatType type, BOOL animate);
static void sendChatFromViewer(const LLWString &wtext, EChatType type, BOOL animate);
@@ -121,7 +119,6 @@ private:
LLHandle<LLView> mPopupMenuHandle;
std::vector<LLChat> mMessageArchive;
- bool mIsHostSet;
};
#endif