Merge branch 'next' of git://github.com/jacek/imprudence into next

Conflicts (manually merged the grids, ignored the other two):
	linden/indra/newview/app_settings/default_grids.xml
	linden/indra/newview/llvoavatar.cpp
	linden/indra/newview/skins/default/xui/en-us/panel_login.xml

2 files changed, 1 insertions, 61 deletions

diff --git a/linden/indra/newview/app_settings/default_grids.xml b/linden/indra/newview/app_settings/default_grids.xml
index ddbd921..7fb35e7 100644
--- a/linden/indra/newview/app_settings/default_grids.xml
+++ b/linden/indra/newview/app_settings/default_grids.xml
@@ -15,35 +15,6 @@
       <key>version</key><string>1</string>
     </map>
 
-    <!-- Aurora Grid -->
-    <map>
-      <key>gridname</key>   <string>Aurora-Grid</string>
-      <key>gridnick</key>   <string>auroragrid</string>
-      <key>platform</key>   <string>OpenSim</string>
-      <key>loginuri</key>   <string>http://login.aurora-sim.org:8002/</string>
-      <key>loginpage</key>  <string>http://login.aurora-sim.org/splash/</string>
-      <key>helperuri</key>  <string>http://grid.aurora-sim.org/</string>
-      <key>password</key>   <string />
-      <key>register</key>   <string />
-      <key>support</key>    <string>http://forum.aurora-sim.org/</string>
-      <key>website</key>    <string>http://aurora-sim.org</string>
-      <key>version</key>    <string>0</string>
-    </map>
-
-    <!-- Craft (offspring of Cyberlandia) -->
-    <map>
-      <key>gridnick</key><string>craft</string>
-      <key>gridname</key><string>Craft</string>
-      <key>platform</key><string>OpenSim</string>
-      <key>loginuri</key><string>http://craft-world.org:8002/</string>
-      <key>loginpage</key><string>http://www.craft-world.org/loginscreen.php</string>
-      <key>helperuri</key><string>http://webapp.craft-world.org/</string>
-      <key>website</key><string>http://www.craft-world.org/</string>
-      <key>register</key><string>http://craft-world.org:8002/wifi/user/account/</string>
-      <key>password</key><string>http://craft-world.org:8002/wifi/forgotpassword</string>
-      <key>version</key><string>0</string>
-    </map>
-
     <!-- GiantGrid -->
     <map>
       <key>gridnick</key><string>giantgrid</string>
@@ -192,21 +163,6 @@
       <key>version</key><string>1</string>
     </map>
 
-    <!-- WorldSimTerra -->
-    <map>
-      <key>gridnick</key><string>worldsimterra</string>
-      <key>gridname</key><string>WorldSimTerra</string>
-      <key>platform</key><string>OpenSim</string>
-      <key>loginuri</key><string>http://wsterra.com:8002</string>
-      <key>loginpage</key><string>http://wsterra.com/log.php</string>
-      <key>helperuri</key><string>http://wsterra.com/</string>
-      <key>website</key><string>http://www.worldsimterra.com/</string>
-      <key>support</key><string>http://www.worldsimterra.com/</string>
-      <key>register</key><string>http://www.worldsimterra.com/</string>
-      <key>password</key><string>http://www.worldsimterra.com/</string>
-      <key>version</key><string>0</string>
-    </map>
-
     <!-- Your Alternative Life -->
     <map>
       <key>gridnick</key><string>youralternativelife</string>
diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index 2ab49df..475c8eb 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -1766,22 +1766,6 @@
 
   <!-- Begin: Client Name Tag -->
 
-  <key>ImprudenceTagColor</key>
-  <map>
-    <key>Comment</key>
-    <string>Color of Imprudence tags (displayed only locally)</string>
-    <key>Persist</key>
-    <integer>1</integer>
-    <key>Type</key>
-    <string>Color4</string>
-    <key>Value</key>
-    <array>
-      <real>0.79</real>
-      <real>0.44</real>
-      <real>0.88</real>
-      <real>1</real>
-    </array>
-  </map>
   <key>ShowClientColor</key>
   <map>
     <key>Comment</key>
@@ -2114,7 +2098,7 @@
     <key>Type</key>
     <string>String</string>
     <key>Value</key>
-    <string>http://kokuaviewer.org/app/dics/</string>
+    <string>http://app.kokuaviewer.org/dics/</string>
   </map>
   <key>EmeraldEnableAutoCorrect</key>
   <map>