aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJacek Antonelli2011-02-22 16:30:33 -0600
committerMcCabe Maxsted2011-02-27 15:48:50 -0700
commit8312c0a9b0714ac18943e9e1949903438134079a (patch)
tree40289a2db318a7cef8c0b4997210700405dfccee
parentUpdated default_grids.xml from current online grids list. (diff)
downloadmeta-impy-8312c0a9b0714ac18943e9e1949903438134079a.zip
meta-impy-8312c0a9b0714ac18943e9e1949903438134079a.tar.gz
meta-impy-8312c0a9b0714ac18943e9e1949903438134079a.tar.bz2
meta-impy-8312c0a9b0714ac18943e9e1949903438134079a.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.xml10
-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
9 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 7ab3612..d5a7527 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -219,7 +219,7 @@
219 <key>Type</key> 219 <key>Type</key>
220 <string>String</string> 220 <string>String</string>
221 <key>Value</key> 221 <key>Value</key>
222 <string>http://imprudenceviewer.org</string> 222 <string>http://blog.kokuaviewer.org</string>
223 </map> 223 </map>
224 <key>BrowserLastVisited</key> 224 <key>BrowserLastVisited</key>
225 <map> 225 <map>
@@ -610,7 +610,7 @@
610 <key>Type</key> 610 <key>Type</key>
611 <string>String</string> 611 <string>String</string>
612 <key>Value</key> 612 <key>Value</key>
613 <string>http://imprudenceviewer.org/app/grids/</string> 613 <string>http://app.kokuaviewer.org/grids/grids.xml</string>
614 </map> 614 </map>
615 <key>GoAction</key> 615 <key>GoAction</key>
616 <map> 616 <map>
@@ -1702,7 +1702,7 @@
1702 <key>Type</key> 1702 <key>Type</key>
1703 <string>String</string> 1703 <string>String</string>
1704 <key>Value</key> 1704 <key>Value</key>
1705 <string>http://imprudenceviewer.org/app/client_list/</string> 1705 <string>http://app.kokuaviewer.org/client_list/</string>
1706 </map> 1706 </map>
1707 1707
1708 <key>WarnClientTags</key> 1708 <key>WarnClientTags</key>
@@ -1967,7 +1967,7 @@
1967 <key>Type</key> 1967 <key>Type</key>
1968 <string>String</string> 1968 <string>String</string>
1969 <key>Value</key> 1969 <key>Value</key>
1970 <string>http://imprudenceviewer.org/app/dics/</string> 1970 <string>http://kokuaviewer.org/app/dics/</string>
1971 </map> 1971 </map>
1972 <key>EmeraldEnableAutoCorrect</key> 1972 <key>EmeraldEnableAutoCorrect</key>
1973 <map> 1973 <map>
@@ -7725,7 +7725,7 @@
7725 <key>Type</key> 7725 <key>Type</key>
7726 <string>String</string> 7726 <string>String</string>
7727 <key>Value</key> 7727 <key>Value</key>
7728 <string>http://imprudenceviewer.org/splash/</string> 7728 <string></string>
7729 </map> 7729 </map>
7730 <key>LogTextureDownloadsToViewerLog</key> 7730 <key>LogTextureDownloadsToViewerLog</key>
7731 <map> 7731 <map>
diff --git a/linden/indra/newview/llappviewer.cpp b/linden/indra/newview/llappviewer.cpp
index 10f61a4..268c4c0 100644
--- a/linden/indra/newview/llappviewer.cpp
+++ b/linden/indra/newview/llappviewer.cpp
@@ -3277,7 +3277,7 @@ void LLAppViewer::badNetworkHandler()
3277 "the issue. \n" 3277 "the issue. \n"
3278 " \n" 3278 " \n"
3279 "If the problem continues, please report the issue at: \n" 3279 "If the problem continues, please report the issue at: \n"
3280 "http://imprudenceviewer.org" << grid_support_msg; 3280 "http://redmine.kokuaviewer.org/projects/imprudence" << grid_support_msg;
3281 forceDisconnect(message.str()); 3281 forceDisconnect(message.str());
3282} 3282}
3283 3283
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 c2424d7..c2afe40 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
@@ -827,12 +827,12 @@
827 <menu_item_call name="Imprudence Blog" 827 <menu_item_call name="Imprudence Blog"
828 label="Imprudence Blog"> 828 label="Imprudence Blog">
829 <on_click function="PromptShowURL" 829 <on_click function="PromptShowURL"
830 userdata="WebLaunchImprudenceBlog,http://imprudenceviewer.org/" /> 830 userdata="WebLaunchImprudenceBlog,http://blog.kokuaviewer.org/" />
831 </menu_item_call> 831 </menu_item_call>
832 <menu_item_call name="Imprudence Forums" 832 <menu_item_call name="Imprudence Forums"
833 label="Imprudence Forums"> 833 label="Imprudence Forums">
834 <on_click function="PromptShowURL" 834 <on_click function="PromptShowURL"
835 userdata="WebLaunchImprudenceForums,http://imprudenceviewer.org/forums/" /> 835 userdata="WebLaunchImprudenceForums,http://forums.kokuaviewer.org/" />
836 </menu_item_call> 836 </menu_item_call>
837 <menu_item_separator /> 837 <menu_item_separator />
838 <menu_item_call name="Scripting Portal" 838 <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 d02f1b3..86beab5 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
@@ -6889,7 +6889,7 @@ The region you have entered is running a different simulator version. Click this
6889 icon="notify.tga" 6889 icon="notify.tga"
6890 name="QueryClientTags" 6890 name="QueryClientTags"
6891 type="notify"> 6891 type="notify">
6892Would you like to have the client tag database automatically updated from imprudenceviewer.org? 6892Would you like to have the client tag database automatically updated from kokuaviewer.org?
6893 6893
6894This ensures that you have the latest information available regarding other clients. 6894This ensures that you have the latest information available regarding other clients.
6895 <form name="form"> 6895 <form name="form">
@@ -6961,7 +6961,7 @@ GRAVITY -- -9.8
6961 6961
6962For information about this feature, click "More Info". 6962For information about this feature, click "More Info".
6963 <url option="1" name="url"> 6963 <url option="1" name="url">
6964 http://imprudenceviewer.org/wiki/Build_Math_Expressions 6964 http://wiki.kokuaviewer.org/wiki/Imprudence:Build_Math_Expressions
6965 </url> 6965 </url>
6966 <usetemplate 6966 <usetemplate
6967 name="okhelpbuttons" 6967 name="okhelpbuttons"
@@ -6990,7 +6990,7 @@ GLOW -- Glow
6990 6990
6991For information about this feature, click "More Info". 6991For information about this feature, click "More Info".
6992 <url option="1" name="url"> 6992 <url option="1" name="url">
6993 http://imprudenceviewer.org/wiki/Build_Math_Expressions 6993 http://wiki.kokuaviewer.org/wiki/Imprudence:Build_Math_Expressions
6994 </url> 6994 </url>
6995 <usetemplate 6995 <usetemplate
6996 name="okhelpbuttons" 6996 name="okhelpbuttons"
@@ -7107,7 +7107,7 @@ WARNING: Don't restore if you aren't sure where the object will go!
7107 7107
7108For information about this feature, click "More Info". 7108For information about this feature, click "More Info".
7109 <url option="1" name="url"> 7109 <url option="1" name="url">
7110 http://imprudenceviewer.org/wiki/Restore_to_Last_Position 7110 http://wiki.kokuaviewer.org/wiki/Imprudence:Restore_to_Last_Position
7111 </url> 7111 </url>
7112 <usetemplate 7112 <usetemplate
7113 name="okcancelhelpignore" 7113 name="okcancelhelpignore"
diff --git a/linden/indra/win_updater/updater.cpp b/linden/indra/win_updater/updater.cpp
index c6fa3c8..8c26ade 100644
--- a/linden/indra/win_updater/updater.cpp
+++ b/linden/indra/win_updater/updater.cpp
@@ -459,7 +459,7 @@ WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nSho
459 L"The Imprudence auto-update has failed.\n" 459 L"The Imprudence auto-update has failed.\n"
460 L"The problem may be caused by other software installed \n" 460 L"The problem may be caused by other software installed \n"
461 L"on your computer, such as a firewall.\n" 461 L"on your computer, such as a firewall.\n"
462 L"Please visit http://imprudenceviewer.org/download/ \n" 462 L"Please visit http://wiki.kokuaviewer.org/wiki/Imprudence:Downloads \n"
463 L"to download the latest version of Imprudence.\n", 463 L"to download the latest version of Imprudence.\n",
464 NULL, MB_OK); 464 NULL, MB_OK);
465 return 1; 465 return 1;