diff options
| author | Dave Parks <davep@lindenlab.com> | 2010-02-24 23:41:22 -0600 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2010-02-24 23:41:22 -0600 |
| commit | 625dd5ead25a71cceb2973192438ae9442ed73d1 (patch) | |
| tree | 142a6613f77f6b725dd99e59ef771fefb34cf127 /indra/newview/llnearbychatbar.cpp | |
| parent | 64d83571c9596900f32d0af63c2dd9968badb82f (diff) | |
| parent | f71098a4065896bd69fcfe55c83dd3a562a7ac64 (diff) | |
Merge with viewer-2-0
Diffstat (limited to 'indra/newview/llnearbychatbar.cpp')
| -rw-r--r-- | indra/newview/llnearbychatbar.cpp | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/indra/newview/llnearbychatbar.cpp b/indra/newview/llnearbychatbar.cpp index ad98a29fb2..483756b16e 100644 --- a/indra/newview/llnearbychatbar.cpp +++ b/indra/newview/llnearbychatbar.cpp @@ -407,32 +407,6 @@ BOOL LLNearbyChatBar::handleKeyHere( KEY key, MASK mask ) return handled; } -S32 LLNearbyChatBar::getMinWidth() const -{ - static S32 min_width = -1; - - if (min_width < 0) - { - const std::string& s = getString("min_width"); - min_width = !s.empty() ? atoi(s.c_str()) : 300; - } - - return min_width; -} - -S32 LLNearbyChatBar::getMaxWidth() const -{ - static S32 max_width = -1; - - if (max_width < 0) - { - const std::string& s = getString("max_width"); - max_width = !s.empty() ? atoi(s.c_str()) : 510; - } - - return max_width; -} - BOOL LLNearbyChatBar::matchChatTypeTrigger(const std::string& in_str, std::string* out_str) { U32 in_len = in_str.length(); |