From 3f9a06a697fae80f0aba5302f6bbfbd8e8648fda Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Mon, 9 Nov 2009 08:41:06 -0700
Subject: Fixed First Use Mini-Map

---
 ChangeLog.txt                                                  | 7 ++++++-
 linden/indra/newview/llappviewer.cpp                           | 1 +
 linden/indra/newview/llfirstuse.cpp                            | 2 +-
 linden/indra/newview/skins/default/xui/en-us/notifications.xml | 7 +++++++
 linden/indra/newview/skins/default/xui/en-us/notify.xml        | 5 -----
 5 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/ChangeLog.txt b/ChangeLog.txt
index a5dfa03..fb3f065 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -3,7 +3,12 @@
 =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
 
 2009-11-08 McCabe Maxsted  <hakushakukun@gmail.com>
-
+	
+	* Removed unused CMake resource files.
+	
+	  modified:   linden/indra/newview/CMakeLists.txt
+	  
+	  
 	* Merged in nearly-done 1.2 with 1.3.
 
 	  Conflicts: 
diff --git a/linden/indra/newview/llappviewer.cpp b/linden/indra/newview/llappviewer.cpp
index 52c4b8d..05d4db9 100644
--- a/linden/indra/newview/llappviewer.cpp
+++ b/linden/indra/newview/llappviewer.cpp
@@ -1730,6 +1730,7 @@ bool LLAppViewer::initConfiguration()
 	LLFirstUse::addConfigVariable("FirstBalanceDecrease");
 	LLFirstUse::addConfigVariable("FirstSit");
 	LLFirstUse::addConfigVariable("FirstMap");
+	LLFirstUse::addConfigVariable("FirstMiniMap");
 	LLFirstUse::addConfigVariable("FirstGoTo");
 	LLFirstUse::addConfigVariable("FirstBuild");
 	LLFirstUse::addConfigVariable("FirstLeftClickNoHit");
diff --git a/linden/indra/newview/llfirstuse.cpp b/linden/indra/newview/llfirstuse.cpp
index 513cba3..e504547 100644
--- a/linden/indra/newview/llfirstuse.cpp
+++ b/linden/indra/newview/llfirstuse.cpp
@@ -142,7 +142,7 @@ void LLFirstUse::useMiniMap()
 	{
 		gSavedSettings.setWarning("FirstMiniMap", FALSE);
 
-		LLNotifyBox::showXml("FirstMiniMap");
+		LLNotifications::instance().add("FirstMiniMap");
 	}
 }
 
diff --git a/linden/indra/newview/skins/default/xui/en-us/notifications.xml b/linden/indra/newview/skins/default/xui/en-us/notifications.xml
index a93373e..e005385 100644
--- a/linden/indra/newview/skins/default/xui/en-us/notifications.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/notifications.xml
@@ -6021,6 +6021,13 @@ Use the controls on the right to find things and display different backgrounds.
 
   <notification
    icon="notify.tga"
+   name="FirstMiniMap"
+   type="notify">
+Right-click the Mini-Map for more options.
+  </notification>
+
+  <notification
+   icon="notify.tga"
    name="FirstBuild"
    type="notify">
 You can build new objects in some areas of [SECOND_LIFE].
diff --git a/linden/indra/newview/skins/default/xui/en-us/notify.xml b/linden/indra/newview/skins/default/xui/en-us/notify.xml
index f1a1955..a0ea083 100644
--- a/linden/indra/newview/skins/default/xui/en-us/notify.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/notify.xml
@@ -836,11 +836,6 @@ and display different backgrounds.
 		</message>
 	</notify>
 <!-- TODO: Make sure all the notifications from Imprudence <= 1.2 are out of here before deleting this. -->
-  <notify name="FirstMiniMap" tip="false">
-    <message name="message">
-      Right-click the Mini-Map for more options.
-    </message>
-  </notify>
 	<notify name="FirstBuild" tip="false">
 		<message name="message">
 			You can build new objects in some areas of [SECOND_LIFE].
-- 
cgit v1.1