diff options
Diffstat (limited to 'linden/indra/newview/llfloaterstats.cpp')
-rw-r--r-- | linden/indra/newview/llfloaterstats.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/linden/indra/newview/llfloaterstats.cpp b/linden/indra/newview/llfloaterstats.cpp index 7b2acd4..745cb27 100644 --- a/linden/indra/newview/llfloaterstats.cpp +++ b/linden/indra/newview/llfloaterstats.cpp | |||
@@ -42,7 +42,7 @@ | |||
42 | const S32 LL_SCROLL_BORDER = 1; | 42 | const S32 LL_SCROLL_BORDER = 1; |
43 | 43 | ||
44 | LLFloaterStats::LLFloaterStats(const LLRect& rect) | 44 | LLFloaterStats::LLFloaterStats(const LLRect& rect) |
45 | : LLFloater("floater_stats", rect, "Statistics", TRUE, rect.getWidth()) | 45 | : LLFloater(std::string("floater_stats"), rect, std::string("Statistics"), TRUE, rect.getWidth()) |
46 | 46 | ||
47 | { | 47 | { |
48 | LLRect stats_rect(0, rect.getHeight() - LLFLOATER_HEADER_SIZE, | 48 | LLRect stats_rect(0, rect.getHeight() - LLFLOATER_HEADER_SIZE, |
@@ -52,7 +52,7 @@ LLFloaterStats::LLFloaterStats(const LLRect& rect) | |||
52 | 52 | ||
53 | LLRect scroll_rect(LL_SCROLL_BORDER, rect.getHeight() - LLFLOATER_HEADER_SIZE - LL_SCROLL_BORDER, | 53 | LLRect scroll_rect(LL_SCROLL_BORDER, rect.getHeight() - LLFLOATER_HEADER_SIZE - LL_SCROLL_BORDER, |
54 | rect.getWidth() - LL_SCROLL_BORDER, LL_SCROLL_BORDER); | 54 | rect.getWidth() - LL_SCROLL_BORDER, LL_SCROLL_BORDER); |
55 | mScrollContainer = new LLScrollableContainerView("statistics_scroll", scroll_rect, mStatsContainer); | 55 | mScrollContainer = new LLScrollableContainerView(std::string("statistics_scroll"), scroll_rect, mStatsContainer); |
56 | mScrollContainer->setFollowsAll(); | 56 | mScrollContainer->setFollowsAll(); |
57 | mScrollContainer->setReserveScrollCorner(TRUE); | 57 | mScrollContainer->setReserveScrollCorner(TRUE); |
58 | 58 | ||
@@ -66,13 +66,13 @@ LLFloaterStats::~LLFloaterStats() | |||
66 | { | 66 | { |
67 | } | 67 | } |
68 | 68 | ||
69 | void LLFloaterStats::reshape(S32 width, S32 height) | 69 | void LLFloaterStats::reshape(S32 width, S32 height, BOOL called_from_parent) |
70 | { | 70 | { |
71 | LLRect rect = mStatsContainer->getRect(); | 71 | LLRect rect = mStatsContainer->getRect(); |
72 | 72 | ||
73 | mStatsContainer->reshape(rect.getWidth() - 2, rect.getHeight(), TRUE); | 73 | mStatsContainer->reshape(rect.getWidth() - 2, rect.getHeight(), TRUE); |
74 | 74 | ||
75 | LLFloater::reshape(width, height); | 75 | LLFloater::reshape(width, height, called_from_parent); |
76 | } | 76 | } |
77 | 77 | ||
78 | 78 | ||