diff options
author | Steven Bennetts <steve@lindenlab.com> | 2009-10-23 17:20:45 +0000 |
---|---|---|
committer | Steven Bennetts <steve@lindenlab.com> | 2009-10-23 17:20:45 +0000 |
commit | b43771cad585cb9820941eb1b24b67390eaa9435 (patch) | |
tree | 322e5f94a1fa473ad4e8c0b343974a72e824f66a /indra/newview/llnearbychatbar.h | |
parent | 0220106ecdecd323854522a5bc3fd6455c60fdfc (diff) |
Merging revisions 2156-2183 of https://svn.aws.productengine.com/secondlife/pe/stable-2 into P:\svn\viewer-2.0.0-3, respecting ancestry
* Bugs: EXT-1590 EXT-1694 EXT-1660 EXT-1646 EXT-1694 EXT-1316 EXT-1775 EXT-1798 EXT-1799 EXT-1117 EXT-1571 EXT-1572
* Dev: EXT-1757 EXT-991 EXT-1758 EXT-1770 EXT-1192 EXT-1613 EXT-1611 EXT-1256 EXT-1758 EXT-747
Diffstat (limited to 'indra/newview/llnearbychatbar.h')
-rw-r--r-- | indra/newview/llnearbychatbar.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llnearbychatbar.h b/indra/newview/llnearbychatbar.h index d6827315f2..b902ff86cc 100644 --- a/indra/newview/llnearbychatbar.h +++ b/indra/newview/llnearbychatbar.h @@ -97,6 +97,9 @@ public: static void sendChatFromViewer(const std::string &utf8text, EChatType type, BOOL animate); static void sendChatFromViewer(const LLWString &wtext, EChatType type, BOOL animate); + S32 getMinWidth() const; + S32 getMaxWidth() const; + /** * Implements LLVoiceClientStatusObserver::onChange() */ |