svn merge -r106715:HEAD svn+ssh://svn.lindenlab.com/svn/linden/branches/q/notifications-merge-r106715 . QAR-1149 -- Final merge of notifications to trunk.

1 files changed, 23 insertions, 23 deletions

diff --git a/indra/newview/llfirstuse.cpp b/indra/newview/llfirstuse.cpp
index 475473abe7..fce4d41207 100644
--- a/indra/newview/llfirstuse.cpp
+++ b/indra/newview/llfirstuse.cpp
@@ -85,9 +85,9 @@ void LLFirstUse::useBalanceIncrease(S32 delta)
 	{
 		gSavedSettings.setWarning("FirstBalanceIncrease", FALSE);
 
-		LLStringUtil::format_map_t args;
-		args["[AMOUNT]"] = llformat("%d",delta);
-		LLNotifyBox::showXml("FirstBalanceIncrease", args);
+		LLSD args;
+		args["AMOUNT"] = llformat("%d",delta);
+		LLNotifications::instance().add("FirstBalanceIncrease", args);
 	}
 }
 
@@ -99,9 +99,9 @@ void LLFirstUse::useBalanceDecrease(S32 delta)
 	{
 		gSavedSettings.setWarning("FirstBalanceDecrease", FALSE);
 
-		LLStringUtil::format_map_t args;
-		args["[AMOUNT]"] = llformat("%d",-delta);
-		LLNotifyBox::showXml("FirstBalanceDecrease", args);
+		LLSD args;
+		args["AMOUNT"] = llformat("%d",-delta);
+		LLNotifications::instance().add("FirstBalanceDecrease", args);
 	}
 }
 
@@ -114,8 +114,8 @@ void LLFirstUse::useSit()
 	//if (gSavedSettings.getWarning("FirstSit"))
 	//{
 	//	gSavedSettings.setWarning("FirstSit", FALSE);
-
-	//	LLNotifyBox::showXml("FirstSit");
+        //
+	//	LLNotifications::instance().add("FirstSit");
 	//}
 }
 
@@ -126,7 +126,7 @@ void LLFirstUse::useMap()
 	{
 		gSavedSettings.setWarning("FirstMap", FALSE);
 
-		LLNotifyBox::showXml("FirstMap");
+		LLNotifications::instance().add("FirstMap");
 	}
 }
 
@@ -143,7 +143,7 @@ void LLFirstUse::useBuild()
 	{
 		gSavedSettings.setWarning("FirstBuild", FALSE);
 
-		LLNotifyBox::showXml("FirstBuild");
+		LLNotifications::instance().add("FirstBuild");
 	}
 }
 
@@ -154,7 +154,7 @@ void LLFirstUse::useLeftClickNoHit()
 	{
 		gSavedSettings.setWarning("FirstLeftClickNoHit", FALSE);
 
-		LLNotifyBox::showXml("FirstLeftClickNoHit");
+		LLNotifications::instance().add("FirstLeftClickNoHit");
 	}
 }
 
@@ -168,7 +168,7 @@ void LLFirstUse::useTeleport()
 		{
 			gSavedSettings.setWarning("FirstTeleport", FALSE);
 
-			LLNotifyBox::showXml("FirstTeleport");
+		        LLNotifications::instance().add("FirstTeleport");
 		}
 	}
 }
@@ -184,7 +184,7 @@ void LLFirstUse::useOverrideKeys()
 		{
 			gSavedSettings.setWarning("FirstOverrideKeys", FALSE);
 
-			LLNotifyBox::showXml("FirstOverrideKeys");
+			LLNotifications::instance().add("FirstOverrideKeys");
 		}
 	}
 }
@@ -202,7 +202,7 @@ void LLFirstUse::useAppearance()
 	{
 		gSavedSettings.setWarning("FirstAppearance", FALSE);
 
-		LLNotifyBox::showXml("FirstAppearance");
+		LLNotifications::instance().add("FirstAppearance");
 	}
 }
 
@@ -213,7 +213,7 @@ void LLFirstUse::useInventory()
 	{
 		gSavedSettings.setWarning("FirstInventory", FALSE);
 
-		LLNotifyBox::showXml("FirstInventory");
+		LLNotifications::instance().add("FirstInventory");
 	}
 }
 
@@ -225,10 +225,10 @@ void LLFirstUse::useSandbox()
 	{
 		gSavedSettings.setWarning("FirstSandbox", FALSE);
 
-		LLStringUtil::format_map_t args;
-		args["[HOURS]"] = llformat("%d",SANDBOX_CLEAN_FREQ);
-		args["[TIME]"] = llformat("%d",SANDBOX_FIRST_CLEAN_HOUR);
-		LLNotifyBox::showXml("FirstSandbox", args);
+		LLSD args;
+		args["HOURS"] = llformat("%d",SANDBOX_CLEAN_FREQ);
+		args["TIME"] = llformat("%d",SANDBOX_FIRST_CLEAN_HOUR);
+		LLNotifications::instance().add("FirstSandbox", args);
 	}
 }
 
@@ -239,7 +239,7 @@ void LLFirstUse::useFlexible()
 	{
 		gSavedSettings.setWarning("FirstFlexible", FALSE);
 
-		LLNotifyBox::showXml("FirstFlexible");
+		LLNotifications::instance().add("FirstFlexible");
 	}
 }
 
@@ -250,7 +250,7 @@ void LLFirstUse::useDebugMenus()
 	{
 		gSavedSettings.setWarning("FirstDebugMenus", FALSE);
 
-		LLNotifyBox::showXml("FirstDebugMenus");
+		LLNotifications::instance().add("FirstDebugMenus");
 	}
 }
 
@@ -261,7 +261,7 @@ void LLFirstUse::useSculptedPrim()
 	{
 		gSavedSettings.setWarning("FirstSculptedPrim", FALSE);
 
-		LLNotifyBox::showXml("FirstSculptedPrim");
+		LLNotifications::instance().add("FirstSculptedPrim");
 		
 	}
 }
@@ -273,6 +273,6 @@ void LLFirstUse::useMedia()
 	{
 		gSavedSettings.setWarning("FirstMedia", FALSE);
 
-		LLNotifyBox::showXml("FirstMedia");
+		LLNotifications::instance().add("FirstMedia");
 	}
 }