diff options
Diffstat (limited to '')
-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 de9b571..ef20138 100644 --- a/linden/indra/newview/llgroupnotify.cpp +++ b/linden/indra/newview/llgroupnotify.cpp | |||
@@ -162,7 +162,7 @@ LLGroupNotifyBox::LLGroupNotifyBox(const char* subject, | |||
162 | 162 | ||
163 | line = new LLTextBox("title",LLRect(x,y,RIGHT - HPAD,y - LINE_HEIGHT),"Group Notice",LLFontGL::sSansSerifHuge); | 163 | line = new LLTextBox("title",LLRect(x,y,RIGHT - HPAD,y - LINE_HEIGHT),"Group Notice",LLFontGL::sSansSerifHuge); |
164 | line->setHAlign(LLFontGL::RIGHT); | 164 | line->setHAlign(LLFontGL::RIGHT); |
165 | line->setDropshadowVisible(true); | 165 | line->setFontStyle(LLFontGL::DROP_SHADOW_SOFT); |
166 | line->setBorderVisible(FALSE); | 166 | line->setBorderVisible(FALSE); |
167 | line->setColor(LLColor4::white); | 167 | line->setColor(LLColor4::white); |
168 | line->setBackgroundColor( gColors.getColor("GroupNotifyBoxColor") ); | 168 | line->setBackgroundColor( gColors.getColor("GroupNotifyBoxColor") ); |
@@ -177,7 +177,7 @@ LLGroupNotifyBox::LLGroupNotifyBox(const char* subject, | |||
177 | from << "Sent by " << from_name << ", " << group_name; | 177 | from << "Sent by " << from_name << ", " << group_name; |
178 | 178 | ||
179 | line = new LLTextBox("group",LLRect(x,y,RIGHT - HPAD,y - LINE_HEIGHT),from.str().c_str(),LLFontGL::sSansSerif); | 179 | line = new LLTextBox("group",LLRect(x,y,RIGHT - HPAD,y - LINE_HEIGHT),from.str().c_str(),LLFontGL::sSansSerif); |
180 | line->setDropshadowVisible(true); | 180 | line->setFontStyle(LLFontGL::DROP_SHADOW_SOFT); |
181 | line->setHAlign(LLFontGL::RIGHT); | 181 | line->setHAlign(LLFontGL::RIGHT); |
182 | line->setBorderVisible(FALSE); | 182 | line->setBorderVisible(FALSE); |
183 | line->setColor(LLColor4::white); | 183 | line->setColor(LLColor4::white); |
@@ -244,7 +244,7 @@ LLGroupNotifyBox::LLGroupNotifyBox(const char* subject, | |||
244 | line = new LLTextBox("subjecttitle",LLRect(x,y,x + LABEL_WIDTH,y - LINE_HEIGHT),"Attached: ",LLFontGL::sSansSerif); | 244 | line = new LLTextBox("subjecttitle",LLRect(x,y,x + LABEL_WIDTH,y - LINE_HEIGHT),"Attached: ",LLFontGL::sSansSerif); |
245 | line->setBorderVisible(FALSE); | 245 | line->setBorderVisible(FALSE); |
246 | line->setColor(LLColor4::white); | 246 | line->setColor(LLColor4::white); |
247 | line->setDropshadowVisible(TRUE); | 247 | line->setFontStyle(LLFontGL::DROP_SHADOW_SOFT); |
248 | line->setBackgroundColor( gColors.getColor("GroupNotifyBoxColor") ); | 248 | line->setBackgroundColor( gColors.getColor("GroupNotifyBoxColor") ); |
249 | addChild(line); | 249 | addChild(line); |
250 | 250 | ||
@@ -261,7 +261,7 @@ LLGroupNotifyBox::LLGroupNotifyBox(const char* subject, | |||
261 | line->setEnabled(FALSE); | 261 | line->setEnabled(FALSE); |
262 | line->setBorderVisible(TRUE); | 262 | line->setBorderVisible(TRUE); |
263 | line->setDisabledColor(LLColor4::blue4); | 263 | line->setDisabledColor(LLColor4::blue4); |
264 | line->setDropshadowVisible(FALSE); | 264 | line->setFontStyle(LLFontGL::NORMAL); |
265 | line->setBackgroundVisible(true); | 265 | line->setBackgroundVisible(true); |
266 | line->setBackgroundColor( semi_transparent ); | 266 | line->setBackgroundColor( semi_transparent ); |
267 | addChild(line); | 267 | addChild(line); |
@@ -399,7 +399,7 @@ void LLGroupNotifyBox::close() | |||
399 | // Then we need to send the inventory declined message | 399 | // Then we need to send the inventory declined message |
400 | if(mHasInventory) | 400 | if(mHasInventory) |
401 | { | 401 | { |
402 | inventory_offer_callback( 1 , mInventoryOffer); | 402 | inventory_offer_callback(IOR_DECLINE , mInventoryOffer); |
403 | } | 403 | } |
404 | gNotifyBoxView->removeChild(this); | 404 | gNotifyBoxView->removeChild(this); |
405 | 405 | ||
@@ -461,7 +461,7 @@ void LLGroupNotifyBox::onClickSaveInventory(void* data) | |||
461 | { | 461 | { |
462 | LLGroupNotifyBox* self = (LLGroupNotifyBox*)data; | 462 | LLGroupNotifyBox* self = (LLGroupNotifyBox*)data; |
463 | 463 | ||
464 | inventory_offer_callback( 0 , self->mInventoryOffer); | 464 | inventory_offer_callback( IOR_ACCEPT , self->mInventoryOffer); |
465 | 465 | ||
466 | // inventory_offer_callback will delete the offer, so make sure we aren't still pointing to it. | 466 | // inventory_offer_callback will delete the offer, so make sure we aren't still pointing to it. |
467 | self->mInventoryOffer = NULL; | 467 | self->mInventoryOffer = NULL; |