aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJacek Antonelli2011-02-22 16:30:33 -0600
committerJacek Antonelli2011-02-22 16:42:39 -0600
commit883102230fc3a6a3bbf157ca4b97beef2d3457d2 (patch)
tree22c5d57b833586117a9ed9ca1fdce68775041a9c
parentUpdated default_grids.xml from current online grids list. (diff)
downloadmeta-impy-883102230fc3a6a3bbf157ca4b97beef2d3457d2.zip
meta-impy-883102230fc3a6a3bbf157ca4b97beef2d3457d2.tar.gz
meta-impy-883102230fc3a6a3bbf157ca4b97beef2d3457d2.tar.bz2
meta-impy-883102230fc3a6a3bbf157ca4b97beef2d3457d2.tar.xz
Changed imprudenceviewer.org URLs to the new kokuaviewer.org URLs.
-rw-r--r--README.txt2
-rw-r--r--linden/indra/llcommon/llsecondlifeurls.cpp2
-rw-r--r--linden/indra/mac_updater/mac_updater.cpp2
-rw-r--r--linden/indra/newview/app_settings/settings.xml6
-rw-r--r--linden/indra/newview/hippoGridManager.cpp2
-rw-r--r--linden/indra/newview/imprudence.url2
-rw-r--r--linden/indra/newview/llappviewer.cpp2
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/floater_about.xml2
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml4
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/notifications.xml10
-rw-r--r--linden/indra/win_updater/updater.cpp2
11 files changed, 18 insertions, 18 deletions
diff --git a/README.txt b/README.txt
index 35f8115..5a56606 100644
--- a/README.txt
+++ b/README.txt
@@ -17,7 +17,7 @@
17 no matter your skills or the amount of time you can dedicate. 17 no matter your skills or the amount of time you can dedicate.
18 18
19 19
20 Imprudence is online at ImprudenceViewer.org 20 Imprudence is online at http://kokuaviewer.org/
21 21
22 22
23 The latest source code for the Imprudence Viewer is available at: 23 The latest source code for the Imprudence Viewer is available at:
diff --git a/linden/indra/llcommon/llsecondlifeurls.cpp b/linden/indra/llcommon/llsecondlifeurls.cpp
index 1669f7b..7be7bde 100644
--- a/linden/indra/llcommon/llsecondlifeurls.cpp
+++ b/linden/indra/llcommon/llsecondlifeurls.cpp
@@ -44,4 +44,4 @@ const std::string BUY_CURRENCY_URL (
44 44
45 45
46const std::string RELEASE_NOTES_BASE_URL ( 46const std::string RELEASE_NOTES_BASE_URL (
47 "http://imprudenceviewer.org/wiki/Release_Notes/"); \ No newline at end of file 47 "http://wiki.kokuaviewer.org/wiki/Imprudence:Release_Notes/");
diff --git a/linden/indra/mac_updater/mac_updater.cpp b/linden/indra/mac_updater/mac_updater.cpp
index cf9de4b..03c6f6f 100644
--- a/linden/indra/mac_updater/mac_updater.cpp
+++ b/linden/indra/mac_updater/mac_updater.cpp
@@ -472,7 +472,7 @@ int main(int argc, char **argv)
472 err = CreateStandardAlert( 472 err = CreateStandardAlert(
473 kAlertStopAlert, 473 kAlertStopAlert,
474 CFSTR("Error"), 474 CFSTR("Error"),
475 CFSTR("An error occurred while updating Imprudence. Please download the latest version from http://imprudenceviewer.org/download/"), 475 CFSTR("An error occurred while updating Imprudence. Please download the latest version from http://wiki.kokuaviewer.org/wiki/Imprudence:Downloads"),
476 &params, 476 &params,
477 &alert); 477 &alert);
478 478
diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index 890d018..c8bdf87 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -68,7 +68,7 @@
68 <key>Type</key> 68 <key>Type</key>
69 <string>String</string> 69 <string>String</string>
70 <key>Value</key> 70 <key>Value</key>
71 <string>http://imprudenceviewer.org</string> 71 <string>http://blog.kokuaviewer.org</string>
72 </map> 72 </map>
73 <key>BrowserLastVisited</key> 73 <key>BrowserLastVisited</key>
74 <map> 74 <map>
@@ -1276,7 +1276,7 @@
1276 <key>Type</key> 1276 <key>Type</key>
1277 <string>String</string> 1277 <string>String</string>
1278 <key>Value</key> 1278 <key>Value</key>
1279 <string>http://imprudenceviewer.org/app/client_list/</string> 1279 <string>http://app.kokuaviewer.org/client_list/</string>
1280 </map> 1280 </map>
1281 1281
1282 <key>WarnClientTags</key> 1282 <key>WarnClientTags</key>
@@ -6921,7 +6921,7 @@
6921 <key>Type</key> 6921 <key>Type</key>
6922 <string>String</string> 6922 <string>String</string>
6923 <key>Value</key> 6923 <key>Value</key>
6924 <string>http://imprudenceviewer.org/splash/</string> 6924 <string></string>
6925 </map> 6925 </map>
6926 <key>LogTextureDownloadsToViewerLog</key> 6926 <key>LogTextureDownloadsToViewerLog</key>
6927 <map> 6927 <map>
diff --git a/linden/indra/newview/hippoGridManager.cpp b/linden/indra/newview/hippoGridManager.cpp
index 5a229fd..bb55881 100644
--- a/linden/indra/newview/hippoGridManager.cpp
+++ b/linden/indra/newview/hippoGridManager.cpp
@@ -799,7 +799,7 @@ void HippoGridManager::loadFromFile()
799 parseFile(gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "default_grids.xml"), !mGridInfo.empty()); 799 parseFile(gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "default_grids.xml"), !mGridInfo.empty());
800 // merge grid info from web site, if newer. Force load, if list of grids is empty. 800 // merge grid info from web site, if newer. Force load, if list of grids is empty.
801 if (gSavedSettings.getBOOL("CheckForGridUpdates")) 801 if (gSavedSettings.getBOOL("CheckForGridUpdates"))
802 parseUrl("http://imprudenceviewer.org/app/grids/", !mGridInfo.empty()); 802 parseUrl("http://app.kokuaviewer.org/grids/grids.xml", !mGridInfo.empty());
803 803
804 std::string last_grid = gSavedSettings.getString("LastSelectedGrid"); 804 std::string last_grid = gSavedSettings.getString("LastSelectedGrid");
805 if (last_grid.empty()) last_grid = gSavedSettings.getString("DefaultGrid"); 805 if (last_grid.empty()) last_grid = gSavedSettings.getString("DefaultGrid");
diff --git a/linden/indra/newview/imprudence.url b/linden/indra/newview/imprudence.url
index 9cc3cc0..959f94f 100644
--- a/linden/indra/newview/imprudence.url
+++ b/linden/indra/newview/imprudence.url
@@ -1,2 +1,2 @@
1[InternetShortcut] 1[InternetShortcut]
2URL=http://imprudenceviewer.org/wiki/Features \ No newline at end of file 2URL=http://wiki.kokuaviewer.org/wiki/Imprudence:Features
diff --git a/linden/indra/newview/llappviewer.cpp b/linden/indra/newview/llappviewer.cpp
index f281734..9182f40 100644
--- a/linden/indra/newview/llappviewer.cpp
+++ b/linden/indra/newview/llappviewer.cpp
@@ -3219,7 +3219,7 @@ void LLAppViewer::badNetworkHandler()
3219 "the issue. \n" 3219 "the issue. \n"
3220 " \n" 3220 " \n"
3221 "If the problem continues, please report the issue at: \n" 3221 "If the problem continues, please report the issue at: \n"
3222 "http://imprudenceviewer.org" << grid_support_msg; 3222 "http://redmine.kokuaviewer.org/projects/imprudence" << grid_support_msg;
3223 forceDisconnect(message.str()); 3223 forceDisconnect(message.str());
3224} 3224}
3225 3225
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_about.xml b/linden/indra/newview/skins/default/xui/en-us/floater_about.xml
index ef02bfa..db4e11d 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_about.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_about.xml
@@ -9,7 +9,7 @@
9 word_wrap="true"> 9 word_wrap="true">
10 The Imprudence Viewer was rocked hard by: 10 The Imprudence Viewer was rocked hard by:
11 Jacek Antonelli, McCabe Maxsted, Armin Weatherwax, Elektra Hesse, and CodeBastard Redgrave. 11 Jacek Antonelli, McCabe Maxsted, Armin Weatherwax, Elektra Hesse, and CodeBastard Redgrave.
12 http://imprudenceviewer.org 12 http://kokuaviewer.org/
13 13
14 Imprudence is so awesome thanks to contributions from many generous people: 14 Imprudence is so awesome thanks to contributions from many generous people:
15 15
diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
index 48f3530..58e3b99 100644
--- a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
@@ -815,12 +815,12 @@
815 <menu_item_call name="Imprudence Blog" 815 <menu_item_call name="Imprudence Blog"
816 label="Imprudence Blog"> 816 label="Imprudence Blog">
817 <on_click function="PromptShowURL" 817 <on_click function="PromptShowURL"
818 userdata="WebLaunchImprudenceBlog,http://imprudenceviewer.org/" /> 818 userdata="WebLaunchImprudenceBlog,http://blog.kokuaviewer.org/" />
819 </menu_item_call> 819 </menu_item_call>
820 <menu_item_call name="Imprudence Forums" 820 <menu_item_call name="Imprudence Forums"
821 label="Imprudence Forums"> 821 label="Imprudence Forums">
822 <on_click function="PromptShowURL" 822 <on_click function="PromptShowURL"
823 userdata="WebLaunchImprudenceForums,http://imprudenceviewer.org/forums/" /> 823 userdata="WebLaunchImprudenceForums,http://forums.kokuaviewer.org/" />
824 </menu_item_call> 824 </menu_item_call>
825 <menu_item_separator /> 825 <menu_item_separator />
826 <menu_item_call name="Scripting Portal" 826 <menu_item_call name="Scripting Portal"
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 04f9f4b..38d5912 100644
--- a/linden/indra/newview/skins/default/xui/en-us/notifications.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/notifications.xml
@@ -1,7 +1,7 @@
1<?xml version="1.0" ?><notifications> 1<?xml version="1.0" ?><notifications>
2 2
3<global name="VIEWER_NAME">Imprudence</global> 3<global name="VIEWER_NAME">Imprudence</global>
4<global name="VIEWER_SITE">imprudenceviewer.org</global> 4<global name="VIEWER_SITE">kokuaviewer.org</global>
5<global name="SECOND_LIFE">Second Life</global> 5<global name="SECOND_LIFE">Second Life</global>
6<global name="SECOND_LIFE_SITE">secondlife.com</global> 6<global name="SECOND_LIFE_SITE">secondlife.com</global>
7 7
@@ -6678,7 +6678,7 @@ The region you have entered is running a different simulator version. Click this
6678 icon="notify.tga" 6678 icon="notify.tga"
6679 name="QueryClientTags" 6679 name="QueryClientTags"
6680 type="notify"> 6680 type="notify">
6681Would you like to have the client tag database automatically updated from imprudenceviewer.org? 6681Would you like to have the client tag database automatically updated from kokuaviewer.org?
6682 6682
6683This ensures that you have the latest information available regarding other clients. 6683This ensures that you have the latest information available regarding other clients.
6684 <form name="form"> 6684 <form name="form">
@@ -6750,7 +6750,7 @@ GRAVITY -- -9.8
6750 6750
6751For information about this feature, click "More Info". 6751For information about this feature, click "More Info".
6752 <url option="1" name="url"> 6752 <url option="1" name="url">
6753 http://imprudenceviewer.org/wiki/Build_Math_Expressions 6753 http://wiki.kokuaviewer.org/wiki/Imprudence:Build_Math_Expressions
6754 </url> 6754 </url>
6755 <usetemplate 6755 <usetemplate
6756 name="okhelpbuttons" 6756 name="okhelpbuttons"
@@ -6779,7 +6779,7 @@ GLOW -- Glow
6779 6779
6780For information about this feature, click "More Info". 6780For information about this feature, click "More Info".
6781 <url option="1" name="url"> 6781 <url option="1" name="url">
6782 http://imprudenceviewer.org/wiki/Build_Math_Expressions 6782 http://wiki.kokuaviewer.org/wiki/Imprudence:Build_Math_Expressions
6783 </url> 6783 </url>
6784 <usetemplate 6784 <usetemplate
6785 name="okhelpbuttons" 6785 name="okhelpbuttons"
@@ -6882,7 +6882,7 @@ WARNING: Don't restore if you aren't sure where the object will go!
6882 6882
6883For information about this feature, click "More Info". 6883For information about this feature, click "More Info".
6884 <url option="1" name="url"> 6884 <url option="1" name="url">
6885 http://imprudenceviewer.org/wiki/Restore_to_Last_Position 6885 http://wiki.kokuaviewer.org/wiki/Imprudence:Restore_to_Last_Position
6886 </url> 6886 </url>
6887 <usetemplate 6887 <usetemplate
6888 name="okcancelhelpignore" 6888 name="okcancelhelpignore"
diff --git a/linden/indra/win_updater/updater.cpp b/linden/indra/win_updater/updater.cpp
index 5031270..3312e7a 100644
--- a/linden/indra/win_updater/updater.cpp
+++ b/linden/indra/win_updater/updater.cpp
@@ -457,7 +457,7 @@ WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nSho
457 L"The Imprudence auto-update has failed.\n" 457 L"The Imprudence auto-update has failed.\n"
458 L"The problem may be caused by other software installed \n" 458 L"The problem may be caused by other software installed \n"
459 L"on your computer, such as a firewall.\n" 459 L"on your computer, such as a firewall.\n"
460 L"Please visit http://imprudenceviewer.org/download/ \n" 460 L"Please visit http://wiki.kokuaviewer.org/wiki/Imprudence:Downloads \n"
461 L"to download the latest version of Imprudence.\n", 461 L"to download the latest version of Imprudence.\n",
462 NULL, MB_OK); 462 NULL, MB_OK);
463 return 1; 463 return 1;