summaryrefslogtreecommitdiff
path: root/indra/newview/llnotificationtiphandler.cpp
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2010-02-22 14:15:58 -0500
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2010-02-22 14:15:58 -0500
commitbd84d36c9d08878c895c896e097e8e3310b61cf3 (patch)
treee2e333ba15c131dfb25c4baf54bcb98fd2a3bd46 /indra/newview/llnotificationtiphandler.cpp
parent00fdc0acd5e27d353c070706e838a35bf889a536 (diff)
parent04712617c55c53dbec1f73a4e8834ebe3167e5ed (diff)
merge
Diffstat (limited to 'indra/newview/llnotificationtiphandler.cpp')
-rw-r--r--indra/newview/llnotificationtiphandler.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/indra/newview/llnotificationtiphandler.cpp b/indra/newview/llnotificationtiphandler.cpp
index c55c8d6221..be76959d07 100644
--- a/indra/newview/llnotificationtiphandler.cpp
+++ b/indra/newview/llnotificationtiphandler.cpp
@@ -43,7 +43,7 @@
using namespace LLNotificationsUI;
-class LLOnalineStatusToast : public LLToastPanel
+class LLOnlineStatusToast : public LLToastPanel
{
public:
@@ -56,9 +56,9 @@ public:
Params() {}
};
- LLOnalineStatusToast(Params& p) : LLToastPanel(p.notification)
+ LLOnlineStatusToast(Params& p) : LLToastPanel(p.notification)
{
- LLUICtrlFactory::getInstance()->buildPanel(this, "panel_online_status.xml");
+ LLUICtrlFactory::getInstance()->buildPanel(this, "panel_online_status_toast.xml");
childSetValue("avatar_icon", p.avatar_id);
childSetValue("message", p.message);
@@ -148,11 +148,11 @@ bool LLTipHandler::processNotification(const LLSD& notify)
LLToastPanel* notify_box = NULL;
if("FriendOffline" == notification->getName() || "FriendOnline" == notification->getName())
{
- LLOnalineStatusToast::Params p;
+ LLOnlineStatusToast::Params p;
p.notification = notification;
p.message = notification->getMessage();
p.avatar_id = notification->getPayload()["FROM_ID"];
- notify_box = new LLOnalineStatusToast(p);
+ notify_box = new LLOnlineStatusToast(p);
}
else
{