summaryrefslogtreecommitdiff
path: root/indra/newview/llfavoritesbar.cpp
diff options
context:
space:
mode:
authorMike Antipov <mantipov@productengine.com>2010-02-01 13:10:45 +0200
committerMike Antipov <mantipov@productengine.com>2010-02-01 13:10:45 +0200
commitb3641c35fe00ea93887ea8980bf69624c8299267 (patch)
tree9b575e425986b3f0496192e95009ba2297158de3 /indra/newview/llfavoritesbar.cpp
parent2e2d65cd10a9b2664d3ce020ef7e7e4de3d6705a (diff)
parent244bef7d0cdb75f011f70d8cd834154eeb469088 (diff)
Merge with default branch
--HG-- branch : product-engine
Diffstat (limited to 'indra/newview/llfavoritesbar.cpp')
-rw-r--r--indra/newview/llfavoritesbar.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llfavoritesbar.cpp b/indra/newview/llfavoritesbar.cpp
index 57e6619470..f5bb777419 100644
--- a/indra/newview/llfavoritesbar.cpp
+++ b/indra/newview/llfavoritesbar.cpp
@@ -780,8 +780,8 @@ LLButton* LLFavoritesBarCtrl::createButton(const LLPointer<LLViewerInventoryItem
* Empty space (or ...) is displaying instead of last symbols, even though the width of the button is enough.
* Problem will gone, if we stretch out the button. For that reason I have to put additional 20 pixels.
*/
- int requred_width = mFont->getWidth(item->getName()) + 20;
- int width = requred_width > def_button_width? def_button_width : requred_width;
+ int required_width = mFont->getWidth(item->getName()) + 20;
+ int width = required_width > def_button_width? def_button_width : required_width;
LLFavoriteLandmarkButton* fav_btn = NULL;
// do we have a place for next button + double buttonHGap + mChevronButton ?