From 667ca55bad0108c4bdf8f007b89e1a52fc766aad Mon Sep 17 00:00:00 2001 From: Kent Quirk Date: Mon, 5 Jan 2009 18:59:12 +0000 Subject: svn merge -r106715:HEAD svn+ssh://svn.lindenlab.com/svn/linden/branches/q/notifications-merge-r106715 . QAR-1149 -- Final merge of notifications to trunk. --- indra/newview/llfloateropenobject.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'indra/newview/llfloateropenobject.cpp') diff --git a/indra/newview/llfloateropenobject.cpp b/indra/newview/llfloateropenobject.cpp index b1380ccd8c..55376c5634 100644 --- a/indra/newview/llfloateropenobject.cpp +++ b/indra/newview/llfloateropenobject.cpp @@ -109,7 +109,7 @@ void LLFloaterOpenObject::show() LLObjectSelectionHandle object_selection = LLSelectMgr::getInstance()->getSelection(); if (object_selection->getRootObjectCount() != 1) { - gViewerWindow->alertXml("UnableToViewContentsMoreThanOne"); + LLNotifications::instance().add("UnableToViewContentsMoreThanOne"); return; } @@ -131,7 +131,7 @@ void LLFloaterOpenObject::moveToInventory(bool wear) { if (mObjectSelection->getRootObjectCount() != 1) { - gViewerWindow->alertXml("OnlyCopyContentsOfSingleItem"); + LLNotifications::instance().add("OnlyCopyContentsOfSingleItem"); return; } @@ -172,7 +172,7 @@ void LLFloaterOpenObject::moveToInventory(bool wear) delete data; data = NULL; - gViewerWindow->alertXml("OpenObjectCannotCopy"); + LLNotifications::instance().add("OpenObjectCannotCopy"); } } -- cgit v1.3