resolved merge conflicts

1 files changed, 5 insertions, 5 deletions

diff --git a/linden/indra/win_updater/updater.cpp b/linden/indra/win_updater/updater.cpp
index 5ea4695..9b99f91 100644
--- a/linden/indra/win_updater/updater.cpp
+++ b/linden/indra/win_updater/updater.cpp
@@ -376,7 +376,7 @@ WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nSho
         }
         else
         {
-                mbstowcs(window_title, "Second Life Updater", 2048);
+                mbstowcs(window_title, "Imprudence Updater", 2048);
         }
         
         WNDCLASSEX wndclassex = { 0 };
@@ -469,11 +469,11 @@ WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nSho
         if (gTotalBytesRead < (1024 * 1024) && ! cancelled)
         {
                 MessageBox(gWindow,
-                        L"The Second Life auto-update has failed.\n"
+                        L"The Imprudence auto-update has failed.\n"
                         L"The problem may be caused by other software installed \n"
                         L"on your computer, such as a firewall.\n"
-                        L"Please visit http://secondlife.com/download/ \n"
-                        L"to download the latest version of Second Life.\n",
+                        L"Please visit http://imprudenceviewer.org/download/ \n"
+                        L"to download the latest version of Imprudence.\n",
                         NULL, MB_OK);
                 return 1;
         }
@@ -487,7 +487,7 @@ WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nSho
         if (!success)
         {
                 MessageBox(gWindow, 
-                        L"Second Life download failed.\n"
+                        L"Imprudence download failed.\n"
                         L"Please try again later.", 
                         NULL, MB_OK);
                 return 1;