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

10 files changed, 19 insertions, 114 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>
diff --git a/linden/indra/newview/llfloaterregioninfo.cpp b/linden/indra/newview/llfloaterregioninfo.cpp
index 717358b..8810a5c 100644
--- a/linden/indra/newview/llfloaterregioninfo.cpp
+++ b/linden/indra/newview/llfloaterregioninfo.cpp
@@ -635,6 +635,7 @@ BOOL LLPanelRegionGeneralInfo::postBuild()
         initHelpBtn("land_resell_help", "HelpRegionLandResell");
         initHelpBtn("parcel_changes_help", "HelpParcelChanges");
         initHelpBtn("parcel_search_help", "HelpRegionSearch");
+        initHelpBtn("minimum_agent_age_help",   "HelpRegionMinimumAge");
 
         childSetAction("kick_btn", onClickKick, this);
         childSetAction("kick_all_btn", onClickKickAll, this);
@@ -971,8 +972,6 @@ BOOL LLPanelRegionDebugInfo::postBuild()
         initHelpBtn("top_colliders_help",               "HelpRegionTopColliders");
         initHelpBtn("top_scripts_help",                 "HelpRegionTopScripts");
         initHelpBtn("restart_help",                             "HelpRegionRestart");
-        initHelpBtn("minimum_agent_age_help",   "HelpRegionMinimumAge");
-        
 
         childSetAction("choose_avatar_btn", onClickChooseAvatar, this);
         childSetAction("return_btn", onClickReturn, this);
diff --git a/linden/indra/newview/llprefsadvanced.cpp b/linden/indra/newview/llprefsadvanced.cpp
index 087acc9..2311896 100644
--- a/linden/indra/newview/llprefsadvanced.cpp
+++ b/linden/indra/newview/llprefsadvanced.cpp
@@ -73,6 +73,7 @@ BOOL LLPrefsAdvanced::postBuild()
         static BOOL* sShowClientNameTag = rebind_llcontrol<BOOL>("ShowClientNameTag", &gSavedSettings, true);
         childSetValue("client_name_tag_check", (*sShowClientNameTag));
         childSetValue("client_name_hover_check", gSavedSettings.getBOOL("ShowClientNameHoverTip"));
+        childSetValue("client_colors_check", gSavedSettings.getBOOL("ShowClientColor"));
         childSetValue("client_name_tag_broadcast_check", gSavedSettings.getBOOL("ShowMyClientTagToOthers"));
 
         childSetValue("appearance_anim_check", gSavedSettings.getBOOL("AppearanceAnimate"));
@@ -117,6 +118,7 @@ void LLPrefsAdvanced::apply()
         gSavedSettings.setBOOL("DisableTeleportScreens", childGetValue("disable_tp_screen_check"));
         gSavedSettings.setBOOL("ShowClientNameTag", childGetValue("client_name_tag_check"));
         gSavedSettings.setBOOL("ShowClientNameHoverTip", childGetValue("client_name_hover_check"));
+        gSavedSettings.setBOOL("ShowClientColor", childGetValue("client_colors_check"));
 
         gSavedSettings.setBOOL("AppearanceAnimate", childGetValue("appearance_anim_check"));
         gSavedSettings.setBOOL("LanguageIsPublic", childGetValue("language_is_public"));
@@ -332,4 +334,3 @@ void LLPrefsAdvanced::onSaveAnyoneCloudButton(void * data)
         std::string filename = gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "cloud.xml");
         LLVOAvatar::saveCloud(filename, LLVOAvatar::sCloud);
 }
-
diff --git a/linden/indra/newview/llprefscolors.cpp b/linden/indra/newview/llprefscolors.cpp
index 0b4caf5..7d69eaf 100644
--- a/linden/indra/newview/llprefscolors.cpp
+++ b/linden/indra/newview/llprefscolors.cpp
@@ -82,10 +82,6 @@ BOOL LLPrefsColors::postBuild()
 
         getChild<LLColorSwatchCtrl>("effect_color_swatch")->set(gSavedSettings.getColor4("EffectColor"));
 
-        getChild<LLColorSwatchCtrl>("client_tag_color")->set(gSavedSettings.getColor4("ImprudenceTagColor"));
-        static BOOL* sShowClientColor = rebind_llcontrol<BOOL>("ShowClientColor", &gSavedSettings, true);
-        childSetValue("client_name_color_check", (*sShowClientColor));
-
         return TRUE;
 }
 
@@ -103,7 +99,6 @@ void LLPrefsColors::refreshColors()
         mFriendsChatColor = gSavedSettings.getColor4("FriendsChatColor");
         mOwnNameChatColor = gSavedSettings.getColor4("OwnNameChatColor");
         mEffectColor = gSavedSettings.getColor4("EffectColor");
-        mClientTagColor = gSavedSettings.getColor4("ImprudenceTagColor");
 }
 
 // static
@@ -135,18 +130,6 @@ void LLPrefsColors::updateFriendsCheck()
         getChild<LLColorSwatchCtrl>("FriendsChatColor")->setEnabled(childGetValue("HighlightFriendsChat"));
 }
 
-// static
-void LLPrefsColors::onCommitCheckClient(LLUICtrl* ctrl, void* userdata)
-{
-        LLPrefsColors* self = (LLPrefsColors*)userdata;
-        self->updateClientCheck();
-}
-
-void LLPrefsColors::updateClientCheck()
-{
-        getChild<LLColorSwatchCtrl>("client_tag_color")->setEnabled(childGetValue("client_name_color_checkt"));
-}
-
 void LLPrefsColors::cancel()
 {
         gSavedSettings.setColor4("SystemChatColor", mSystemChatColor);
@@ -161,7 +144,6 @@ void LLPrefsColors::cancel()
         gSavedSettings.setColor4("FriendsChatColor", mFriendsChatColor);
         gSavedSettings.setColor4("OwnNameChatColor", mOwnNameChatColor);
         gSavedSettings.setColor4("EffectColor", mEffectColor);
-        gSavedSettings.setColor4("ImprudenceTagColor", mClientTagColor);
 }
 
 void LLPrefsColors::apply()
@@ -198,8 +180,5 @@ void LLPrefsColors::apply()
 
         gSavedSettings.setColor4("EffectColor", childGetValue("effect_color_swatch"));
 
-        gSavedSettings.setBOOL("ShowClientColor", childGetValue("client_name_color_check"));
-        gSavedSettings.setColor4("ImprudenceTagColor", getChild<LLColorSwatchCtrl>("client_tag_color")->get());
-
         refreshColors(); // member values become the official values and cancel becomes a no-op.
 }
diff --git a/linden/indra/newview/llprefscolors.h b/linden/indra/newview/llprefscolors.h
index d580add..88ea371 100644
--- a/linden/indra/newview/llprefscolors.h
+++ b/linden/indra/newview/llprefscolors.h
@@ -47,11 +47,9 @@ public:
 private:
         static void onCommitCheckSelfName(LLUICtrl* ctrl, void* userdata);
         static void onCommitCheckFriends(LLUICtrl* ctrl, void* userdata);
-        static void onCommitCheckClient(LLUICtrl* ctrl, void* userdata);
         void refreshColors();
         void updateFriendsCheck();
         void updateSelfCheck();
-        void updateClientCheck();
 
         LLColor4 mSystemChatColor;
         LLColor4 mUserChatColor;
@@ -65,7 +63,6 @@ private:
         LLColor4 mFriendsChatColor;
         LLColor4 mOwnNameChatColor;
         LLColor4 mEffectColor;
-        LLColor4 mClientTagColor;
 };
 
 #endif //LLPREFSCOLORS_H
diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_inventory.xml b/linden/indra/newview/skins/default/xui/en-us/menu_inventory.xml
index 86dc5c7..0cbd7c6 100644
--- a/linden/indra/newview/skins/default/xui/en-us/menu_inventory.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/menu_inventory.xml
@@ -166,10 +166,12 @@
                 <on_click filter="" function="Inventory.DoToSelected" userdata="copy_uuid" />
         </menu_item_call>
         <menu_item_separator name="Copy Separator" />
+<!-- See IMP-961 http://redmine.kokuaviewer.org/issues/961
   <menu_item_call bottom_delta="-18" height="18" label="Cut" left="0" mouse_opaque="true"
              name="Cut" width="128">
     <on_click filter="" function="Inventory.DoToSelected" userdata="cut" />
   </menu_item_call>
+-->
   <menu_item_call bottom_delta="-18" height="18" label="Copy" left="0" mouse_opaque="true"
              name="Copy" width="128">
     <on_click filter="" function="Inventory.DoToSelected" userdata="copy" />
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml
index c037439..aedda8a 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml
@@ -73,7 +73,7 @@ USE left="270" FOR TABBING OPTIONS
       
       <check_box bottom_delta="-25" enabled="true" follows="left|top"
           font="SansSerifSmall" height="16" initial_value="false"
-          label="Show client names in nametags" left_delta="30" mouse_opaque="true"
+          label="Show client names in nametags" left="50" mouse_opaque="true"
           name="client_name_tag_check" radio_style="false" width="160" />
       <check_box bottom_delta="0" enabled="true" follows="left|top"
            font="SansSerifSmall" height="16" initial_value="false"
@@ -81,12 +81,16 @@ USE left="270" FOR TABBING OPTIONS
            name="client_name_hover_check" radio_style="false" width="160" />
       <check_box bottom_delta="-18" enabled="true" follows="left|top"
            font="SansSerifSmall" height="16" initial_value="false"
-           label="Show your client name to others" left="50" mouse_opaque="true"
+           label="Show client name tag colors" left="50" mouse_opaque="true"
+           name="client_colors_check" radio_style="false" width="160" />
+      <check_box bottom_delta="0" enabled="true" follows="left|top"
+           font="SansSerifSmall" height="16" initial_value="false"
+           label="Show your client name to others" left="270" mouse_opaque="true"
            name="client_name_tag_broadcast_check" radio_style="false" width="217" />
       <check_box bottom_delta="-18" enabled="true" follows="left|top"
            font="SansSerifSmall" height="16" initial_value="false"
            tool_tip="Toggle editing animation and standing up when entering appearance mode"
-           label="Animate avatar when editing appearance" left_delta="0" mouse_opaque="true"
+           label="Animate avatar when editing appearance" left="50" mouse_opaque="true"
            name="appearance_anim_check" radio_style="false" width="217" />
       <check_box bottom_delta="-18" control_name="HeadFollowsMouse" enabled="true"
            follows="left|top" font="SansSerifSmall" height="16"
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_chat.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_chat.xml
index e14442a..cf947ee 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_chat.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_chat.xml
@@ -215,7 +215,7 @@ USE left="270" FOR TABBING OPTIONS
 
       <text bottom_delta="-30" follows="left|top" font="SansSerifSmall" height="16" left_delta="-30"
          name="EmSpell_txt1" width="512">
-        Current language (dictionary):
+        Base dictionary:
       </text>
       <combo_box allow_text_entry="false" bottom_delta="-20" left_delta="0" follows="left|top" height="18"
          max_chars="200" mouse_opaque="true" name="EmeraldSpellBase" width="250"
@@ -223,13 +223,13 @@ USE left="270" FOR TABBING OPTIONS
 
       <text bottom_delta="-30" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
          name="EmSpell_txt3" width="512">
-        Downloaded languages (dictionaries):
+        Available (inactive) extra dictionaries:
       </text>
       <combo_box allow_text_entry="false" bottom_delta="-20" left_delta="0" follows="left|top" height="18"
          max_chars="200" mouse_opaque="true" name="EmSpell_Avail" width="250"
          control_name="EmSpell_Avail" tool_tip=""/>
 
-      <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="20" label="Install"
+      <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="20" label="Activate"
          name="EmSpell_Add" tool_tip="" left_delta="255" width="110"/>
 
       <button bottom_delta="-22" follows="left|top" font="SansSerifSmall" height="20" label="Download More..."
@@ -237,13 +237,13 @@ USE left="270" FOR TABBING OPTIONS
 
       <text bottom_delta="-30" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
          name="EmSpell_txt2" width="512">
-        Additional custom languages (dictionaries):
+        Active extra dictionaries:
       </text>
       <combo_box allow_text_entry="false" bottom_delta="-20" left_delta="0" follows="left|top" height="18"
          max_chars="200" mouse_opaque="true" name="EmSpell_Installed" width="250"
          control_name="EmSpell_Installed" tool_tip=""/>
 
-      <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="20" label="Remove"
+      <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="20" label="Deactivate"
          name="EmSpell_Remove" tool_tip="" left_delta="255" width="110"/>
 
       <!--<button bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="18" label="Edit Custom dictionary"
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_colors.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_colors.xml
index 9b55822..04e71d4 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_colors.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_colors.xml
@@ -33,24 +33,7 @@ USE left="270" FOR TABBING OPTIONS
              tool_tip="Click to open Color Picker" width="65" />
   
   
-  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-        bottom="-20" drop_shadow_visible="true" enabled="true" follows="left|top" font-style="BOLD|SHADOW"
-        font="SansSerifSmall" h_pad="0" halign="left" height="10" left="270"
-        mouse_opaque="true" name="client_tag_color_textbox" v_pad="0" width="394">
-    Client Tag Color:
-  </text>
-  <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom_delta="-80"
-       can_apply_immediately="true" color="0.79 0.44 0.88 1"
-       enabled="true" follows="left|top"
-       height="65" label="Imprudence" left_delta="30" mouse_opaque="true"
-       name="client_tag_color" width="65" />
-  <check_box bottom_delta="45" enabled="true" follows="left|top"
-       font="SansSerifSmall" height="16" initial_value="false"
-       label="Color client tags" left_delta="76" mouse_opaque="true"
-       name="client_name_color_check" radio_style="false" width="160" />
-  
-  
-  <view_border bevel_style="none" border_thickness="1" bottom_delta="-60" follows="left|top"
+  <view_border bevel_style="none" border_thickness="1" bottom_delta="0" follows="left|top"
        height="1" left="55" name="border" width="380" />