aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llfloatertools.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'linden/indra/newview/llfloatertools.cpp')
-rw-r--r--linden/indra/newview/llfloatertools.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/linden/indra/newview/llfloatertools.cpp b/linden/indra/newview/llfloatertools.cpp
index a37663e..5a7fdff 100644
--- a/linden/indra/newview/llfloatertools.cpp
+++ b/linden/indra/newview/llfloatertools.cpp
@@ -1143,29 +1143,29 @@ void LLFloaterTools::onClickLink(void* data)
1143{ 1143{
1144 if(!LLSelectMgr::getInstance()->selectGetAllRootsValid()) 1144 if(!LLSelectMgr::getInstance()->selectGetAllRootsValid())
1145 { 1145 {
1146 LLNotifyBox::showXml("UnableToLinkWhileDownloading"); 1146 LLNotifications::instance().add("UnableToLinkWhileDownloading");
1147 return; 1147 return;
1148 } 1148 }
1149 1149
1150 S32 object_count = LLSelectMgr::getInstance()->getSelection()->getObjectCount(); 1150 S32 object_count = LLSelectMgr::getInstance()->getSelection()->getObjectCount();
1151 if (object_count > MAX_CHILDREN_PER_TASK + 1) 1151 if (object_count > MAX_CHILDREN_PER_TASK + 1)
1152 { 1152 {
1153 LLStringUtil::format_map_t args; 1153 LLSD args;
1154 args["[COUNT]"] = llformat("%d", object_count); 1154 args["COUNT"] = llformat("%d", object_count);
1155 int max = MAX_CHILDREN_PER_TASK+1; 1155 int max = MAX_CHILDREN_PER_TASK+1;
1156 args["[MAX]"] = llformat("%d", max); 1156 args["MAX"] = llformat("%d", max);
1157 gViewerWindow->alertXml("UnableToLinkObjects", args); 1157 LLNotifications::instance().add("UnableToLinkObjects", args);
1158 return; 1158 return;
1159 } 1159 }
1160 1160
1161 if(LLSelectMgr::getInstance()->getSelection()->getRootObjectCount() < 2) 1161 if(LLSelectMgr::getInstance()->getSelection()->getRootObjectCount() < 2)
1162 { 1162 {
1163 gViewerWindow->alertXml("CannotLinkIncompleteSet"); 1163 LLNotifications::instance().add("CannotLinkIncompleteSet");
1164 return; 1164 return;
1165 } 1165 }
1166 if(!LLSelectMgr::getInstance()->selectGetRootsModify()) 1166 if(!LLSelectMgr::getInstance()->selectGetRootsModify())
1167 { 1167 {
1168 gViewerWindow->alertXml("CannotLinkModify"); 1168 LLNotifications::instance().add("CannotLinkModify");
1169 return; 1169 return;
1170 } 1170 }
1171 LLUUID owner_id; 1171 LLUUID owner_id;
@@ -1175,7 +1175,7 @@ void LLFloaterTools::onClickLink(void* data)
1175 // we don't actually care if you're the owner, but novices are 1175 // we don't actually care if you're the owner, but novices are
1176 // the most likely to be stumped by this one, so offer the 1176 // the most likely to be stumped by this one, so offer the
1177 // easiest and most likely solution. 1177 // easiest and most likely solution.
1178 gViewerWindow->alertXml("CannotLinkDifferentOwners"); 1178 LLNotifications::instance().add("CannotLinkDifferentOwners");
1179 return; 1179 return;
1180 } 1180 }
1181 LLSelectMgr::getInstance()->sendLink(); 1181 LLSelectMgr::getInstance()->sendLink();