diff options
author | Jacek Antonelli | 2008-08-15 23:45:34 -0500 |
---|---|---|
committer | Jacek Antonelli | 2008-08-15 23:45:34 -0500 |
commit | cd17687f01420952712a500107e0f93e7ab8d5f8 (patch) | |
tree | ce48c2b706f2c1176290e39fb555fbdf6648ce01 /linden/indra/newview/llgroupnotify.cpp | |
parent | Second Life viewer sources 1.19.0.5 (diff) | |
download | meta-impy-cd17687f01420952712a500107e0f93e7ab8d5f8.zip meta-impy-cd17687f01420952712a500107e0f93e7ab8d5f8.tar.gz meta-impy-cd17687f01420952712a500107e0f93e7ab8d5f8.tar.bz2 meta-impy-cd17687f01420952712a500107e0f93e7ab8d5f8.tar.xz |
Second Life viewer sources 1.19.1.0
Diffstat (limited to 'linden/indra/newview/llgroupnotify.cpp')
-rw-r--r-- | linden/indra/newview/llgroupnotify.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/linden/indra/newview/llgroupnotify.cpp b/linden/indra/newview/llgroupnotify.cpp index e6f535f..cae784b 100644 --- a/linden/indra/newview/llgroupnotify.cpp +++ b/linden/indra/newview/llgroupnotify.cpp | |||
@@ -129,7 +129,7 @@ LLGroupNotifyBox::LLGroupNotifyBox(const char* subject, | |||
129 | mHasInventory(has_inventory), | 129 | mHasInventory(has_inventory), |
130 | mInventoryOffer(inventory_offer) | 130 | mInventoryOffer(inventory_offer) |
131 | { | 131 | { |
132 | mIsFocusRoot = TRUE; | 132 | setFocusRoot(TRUE); |
133 | 133 | ||
134 | time_t timestamp = (time_t)t; | 134 | time_t timestamp = (time_t)t; |
135 | 135 | ||
@@ -147,10 +147,10 @@ LLGroupNotifyBox::LLGroupNotifyBox(const char* subject, | |||
147 | LLTextEditor* text; | 147 | LLTextEditor* text; |
148 | 148 | ||
149 | const S32 VPAD = 2; | 149 | const S32 VPAD = 2; |
150 | const S32 TOP = mRect.getHeight() - 32; // Get past the top menu bar | 150 | const S32 TOP = getRect().getHeight() - 32; // Get past the top menu bar |
151 | const S32 BOTTOM_PAD = VPAD * 2; | 151 | const S32 BOTTOM_PAD = VPAD * 2; |
152 | const S32 BTN_TOP = BOTTOM_PAD + BTN_HEIGHT + VPAD; | 152 | const S32 BTN_TOP = BOTTOM_PAD + BTN_HEIGHT + VPAD; |
153 | const S32 RIGHT = mRect.getWidth() - HPAD - HPAD; | 153 | const S32 RIGHT = getRect().getWidth() - HPAD - HPAD; |
154 | const S32 LINE_HEIGHT = 16; | 154 | const S32 LINE_HEIGHT = 16; |
155 | 155 | ||
156 | const S32 LABEL_WIDTH = 64; | 156 | const S32 LABEL_WIDTH = 64; |
@@ -230,7 +230,7 @@ LLGroupNotifyBox::LLGroupNotifyBox(const char* subject, | |||
230 | text->setEnabled(FALSE); | 230 | text->setEnabled(FALSE); |
231 | text->setWordWrap(TRUE); | 231 | text->setWordWrap(TRUE); |
232 | text->setTabStop(FALSE); | 232 | text->setTabStop(FALSE); |
233 | text->setTabToNextField(TRUE); | 233 | text->setTabsToNextField(TRUE); |
234 | text->setMouseOpaque(TRUE); | 234 | text->setMouseOpaque(TRUE); |
235 | text->setBorderVisible(TRUE); | 235 | text->setBorderVisible(TRUE); |
236 | text->setTakesNonScrollClicks(TRUE); | 236 | text->setTakesNonScrollClicks(TRUE); |
@@ -278,7 +278,7 @@ LLGroupNotifyBox::LLGroupNotifyBox(const char* subject, | |||
278 | 278 | ||
279 | LLButton* btn; | 279 | LLButton* btn; |
280 | btn = new LLButton("next", | 280 | btn = new LLButton("next", |
281 | LLRect(mRect.getWidth()-24, BOTTOM_PAD+16, mRect.getWidth()-8, BOTTOM_PAD), | 281 | LLRect(getRect().getWidth()-24, BOTTOM_PAD+16, getRect().getWidth()-8, BOTTOM_PAD), |
282 | "notify_next.tga", | 282 | "notify_next.tga", |
283 | "notify_next.tga", | 283 | "notify_next.tga", |
284 | "", | 284 | "", |
@@ -377,7 +377,7 @@ void LLGroupNotifyBox::draw() | |||
377 | glMatrixMode(GL_MODELVIEW); | 377 | glMatrixMode(GL_MODELVIEW); |
378 | glPushMatrix(); | 378 | glPushMatrix(); |
379 | 379 | ||
380 | S32 height = mRect.getHeight(); | 380 | S32 height = getRect().getHeight(); |
381 | F32 fraction = display_time / ANIMATION_TIME; | 381 | F32 fraction = display_time / ANIMATION_TIME; |
382 | F32 voffset = (1.f - fraction) * height; | 382 | F32 voffset = (1.f - fraction) * height; |
383 | 383 | ||