diff options
| author | Mike Antipov <mantipov@productengine.com> | 2010-02-24 16:41:28 +0200 |
|---|---|---|
| committer | Mike Antipov <mantipov@productengine.com> | 2010-02-24 16:41:28 +0200 |
| commit | acc97bd55fbdaecb16f47ae53e896eb0ca7d53c5 (patch) | |
| tree | 5b7f5c377aa96ed53cb9e1d519eec301104e021e /indra/newview/llnearbychatbar.cpp | |
| parent | 6575b685e91d334198789c88dec2efab7e5a1ac9 (diff) | |
Work on major bug EXT-5589 (Notifications button falls under side panel)
Applayed Eugene Mutavchi's patch:
-- removed min/max width params from xml <string> tags
-- "min_width" for nearby chat bar now is got from the an appropriate layout panel params
-- "max_width" for nearby chat bar is moved to constant.
--HG--
branch : product-engine
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(); |