livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

make this at least build, but no real flesh yet.

meow-7.2.2
Tofu Linden 2010-09-20 13:04:56 +01:00
parent 301f0c6a3b
commit 34a55f2f05
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
indra/newview/lltoastscripttextbox.cpp
View File

@ -48,9 +48,9 @@
#include "llfloaterinventory.h"
#include "llinventorytype.h"
const S32 LLToastGroupNotifyPanel::DEFAULT_MESSAGE_MAX_LINE_COUNT = 7;
const S32 LLToastScriptTextbox::DEFAULT_MESSAGE_MAX_LINE_COUNT = 7;
LLToastGroupNotifyPanel::LLToastGroupNotifyPanel(LLNotificationPtr& notification)
LLToastScriptTextbox::LLToastScriptTextbox(LLNotificationPtr& notification)
: LLToastPanel(notification),
mInventoryOffer(NULL)
{
@ -125,7 +125,7 @@ LLToastGroupNotifyPanel::LLToastGroupNotifyPanel(LLNotificationPtr& notification
mInventoryOffer = new LLOfferInfo(payload["inventory_offer"]);
getChild<LLTextBox>("attachment")->setClickedCallback(boost::bind(
&LLToastGroupNotifyPanel::onClickAttachment, this));
&LLToastScriptTextbox::onClickAttachment, this));
LLUIImagePtr attachIconImg = LLInventoryIcon::getIcon(mInventoryOffer->mType,
LLInventoryType::IT_TEXTURE);
@ -134,7 +134,7 @@ LLToastGroupNotifyPanel::LLToastGroupNotifyPanel(LLNotificationPtr& notification
//ok button
LLButton* pOkBtn = getChild<LLButton>("btn_ok");
pOkBtn->setClickedCallback((boost::bind(&LLToastGroupNotifyPanel::onClickOk, this)));
pOkBtn->setClickedCallback((boost::bind(&LLToastScriptTextbox::onClickOk, this)));
setDefaultBtn(pOkBtn);
S32 maxLinesCount;
@ -147,11 +147,11 @@ LLToastGroupNotifyPanel::LLToastGroupNotifyPanel(LLNotificationPtr& notification
}
// virtual
LLToastGroupNotifyPanel::~LLToastGroupNotifyPanel()
LLToastScriptTextbox::~LLToastScriptTextbox()
{
}
void LLToastGroupNotifyPanel::close()
void LLToastScriptTextbox::close()
{
// The group notice dialog may be an inventory offer.
// If it has an inventory save button and that button is still enabled
@ -165,14 +165,14 @@ void LLToastGroupNotifyPanel::close()
die();
}
void LLToastGroupNotifyPanel::onClickOk()
void LLToastScriptTextbox::onClickOk()
{
LLSD response = mNotification->getResponseTemplate();
mNotification->respond(response);
close();
}
void LLToastGroupNotifyPanel::onClickAttachment()
void LLToastScriptTextbox::onClickAttachment()
{
if (mInventoryOffer != NULL) {
mInventoryOffer->forceResponse(IOR_ACCEPT);
@ -196,7 +196,7 @@ void LLToastGroupNotifyPanel::onClickAttachment()
}
//static
bool LLToastGroupNotifyPanel::isAttachmentOpenable(LLAssetType::EType type)
bool LLToastScriptTextbox::isAttachmentOpenable(LLAssetType::EType type)
{
switch(type)
{

6
indra/newview/lltoastscripttextbox.h
View File

@ -41,7 +41,7 @@ class LLButton;
*
* Replaces class LLGroupNotifyBox.
*/
class LLToastGroupNotifyPanel
class LLToastScriptTextbox
: public LLToastPanel
{
public:
@ -53,9 +53,9 @@ public:
// Non-transient messages. You can specify non-default button
// layouts (like one for script dialogs) by passing various
// numbers in for "layout".
LLToastGroupNotifyPanel(LLNotificationPtr& notification);
LLToastScriptTextbox(LLNotificationPtr& notification);
/*virtual*/ ~LLToastGroupNotifyPanel();
/*virtual*/ ~LLToastScriptTextbox();
protected:
void onClickOk();
void onClickAttachment();