aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview
diff options
context:
space:
mode:
Diffstat (limited to 'linden/indra/newview')
-rw-r--r--linden/indra/newview/llappviewer.cpp1
-rw-r--r--linden/indra/newview/llfirstuse.cpp2
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/notifications.xml7
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/notify.xml5
4 files changed, 9 insertions, 6 deletions
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()
1730 LLFirstUse::addConfigVariable("FirstBalanceDecrease"); 1730 LLFirstUse::addConfigVariable("FirstBalanceDecrease");
1731 LLFirstUse::addConfigVariable("FirstSit"); 1731 LLFirstUse::addConfigVariable("FirstSit");
1732 LLFirstUse::addConfigVariable("FirstMap"); 1732 LLFirstUse::addConfigVariable("FirstMap");
1733 LLFirstUse::addConfigVariable("FirstMiniMap");
1733 LLFirstUse::addConfigVariable("FirstGoTo"); 1734 LLFirstUse::addConfigVariable("FirstGoTo");
1734 LLFirstUse::addConfigVariable("FirstBuild"); 1735 LLFirstUse::addConfigVariable("FirstBuild");
1735 LLFirstUse::addConfigVariable("FirstLeftClickNoHit"); 1736 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()
142 { 142 {
143 gSavedSettings.setWarning("FirstMiniMap", FALSE); 143 gSavedSettings.setWarning("FirstMiniMap", FALSE);
144 144
145 LLNotifyBox::showXml("FirstMiniMap"); 145 LLNotifications::instance().add("FirstMiniMap");
146 } 146 }
147} 147}
148 148
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.
6021 6021
6022 <notification 6022 <notification
6023 icon="notify.tga" 6023 icon="notify.tga"
6024 name="FirstMiniMap"
6025 type="notify">
6026Right-click the Mini-Map for more options.
6027 </notification>
6028
6029 <notification
6030 icon="notify.tga"
6024 name="FirstBuild" 6031 name="FirstBuild"
6025 type="notify"> 6032 type="notify">
6026You can build new objects in some areas of [SECOND_LIFE]. 6033You 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.
836 </message> 836 </message>
837 </notify> 837 </notify>
838<!-- TODO: Make sure all the notifications from Imprudence <= 1.2 are out of here before deleting this. --> 838<!-- TODO: Make sure all the notifications from Imprudence <= 1.2 are out of here before deleting this. -->
839 <notify name="FirstMiniMap" tip="false">
840 <message name="message">
841 Right-click the Mini-Map for more options.
842 </message>
843 </notify>
844 <notify name="FirstBuild" tip="false"> 839 <notify name="FirstBuild" tip="false">
845 <message name="message"> 840 <message name="message">
846 You can build new objects in some areas of [SECOND_LIFE]. 841 You can build new objects in some areas of [SECOND_LIFE].