Add MoyMiniMapCustomColor swatch to Vanity Preferences.

Fixed spacing of MoyMiniMapCustomColor in settings_ascent_coa.xml and removed it from settings_per_account.xml

TODO: Make MoyMiniMapCustomColor more flexible.
-Added ColorCustomChat checkbox, pref code, and setting commented out.

indra/newview/app_settings/settings_ascent_coa.xml

@@ -31,7 +31,7 @@
       <integer>1</integer>
     </map>
 
-    <key>MoyMiniMapCustomColor</key>
+        <key>MoyMiniMapCustomColor</key>
 		<map>
 			<key>Comment</key>
 			<string>Custom minimap color you wish to have.</string>
@@ -256,6 +256,20 @@
           <key>IsCOA</key>
           <integer>1</integer>
         </map>
+        <!--TODO: implement this and make MoyMiniMapCustomColor more flexible
+        <key>ColorCustomChat</key>
+        <map>
+          <key>Comment</key>
+          <string>Color chat from users you have chosen using MoyMiniMapCustomColor</string>
+          <key>Persist</key>
+          <integer>1</integer>
+          <key>Type</key>
+          <string>Boolean</string>
+          <key>Value</key>
+          <integer>0</integer>
+          <key>IsCOA</key>
+          <integer>1</integer>
+        </map-->
         <key>AscentReportClientUUID</key>
 		<map>
 			<key>Comment</key>

indra/newview/app_settings/settings_per_account.xml

@@ -357,22 +357,6 @@
 			<string>This is an autoresponse!</string>
 		</map>
 	</map>
-	<key>MoyMiniMapCustomColor</key>
-	<map>
-		<key>Comment</key>
-		<string>Custom minimap color you wish to have.</string>
-		<key>Persist</key>
-		<integer>1</integer>
-		<key>Type</key>
-		<string>Color4</string>
-		<key>Value</key>
-		<array>
-			<real>0.375</real>
-			<real>1.0</real>
-			<real>1.0</real>
-			<real>1.0</real>
-		</array>
-	</map>
 	<!-- Ascent Account-Specific (Always) -->
     <!-- General additions -->
     <key>rkeastInventoryPreviousCount</key>

indra/newview/ascentprefsvan.cpp

@@ -211,11 +211,12 @@ void LLPrefsAscentVan::refreshValues()
     mEstateOwnerColor		= gSavedSettings.getColor4("AscentEstateOwnerColor");
     mLindenColor			= gSavedSettings.getColor4("AscentLindenColor");
     mMutedColor				= gSavedSettings.getColor4("AscentMutedColor");
-    //mCustomColor			= gSavedSettings.getColor4("MoyMiniMapCustomColor");
+    mCustomColor			= gSavedSettings.getColor4("MoyMiniMapCustomColor");
 	mColorFriendChat        = gSavedSettings.getBOOL("ColorFriendChat");
 	mColorEOChat            = gSavedSettings.getBOOL("ColorEstateOwnerChat");
 	mColorLindenChat        = gSavedSettings.getBOOL("ColorLindenChat");
 	mColorMutedChat         = gSavedSettings.getBOOL("ColorMutedChat");
+//	mColorCustomChat        = gSavedSettings.getBOOL("ColorCustomChat");
 
     //Body Dynamics --------------------------------------------------------------------------
     mBreastPhysicsToggle    = gSavedSettings.getBOOL("EmeraldBreastPhysicsToggle");
@@ -293,11 +294,12 @@ void LLPrefsAscentVan::cancel()
     gSavedSettings.setColor4("AscentEstateOwnerColor",   mEstateOwnerColor);
     gSavedSettings.setColor4("AscentLindenColor",        mLindenColor);
     gSavedSettings.setColor4("AscentMutedColor",         mMutedColor);
-//    gSavedSettings.setColor4("MoyMiniMapCustomColor",    mCustomColor);
+    gSavedSettings.setColor4("MoyMiniMapCustomColor",    mCustomColor);
     gSavedSettings.setBOOL("ColorFriendChat",            mColorFriendChat);
     gSavedSettings.setBOOL("ColorEstateOwnerChat",       mColorEOChat);
     gSavedSettings.setBOOL("ColorLindenChat",            mColorLindenChat);
     gSavedSettings.setBOOL("ColorMutedChat",             mColorMutedChat);
+//	gSavedSettings.setBOOL("ColorCustomChat",            mColorCustomChat);
 
     //Body Dynamics --------------------------------------------------------------------------
     gSavedSettings.setBOOL("EmeraldBreastPhysicsToggle", mBreastPhysicsToggle);

indra/newview/ascentprefsvan.h

@@ -82,10 +82,12 @@ protected:
     LLColor4 mEstateOwnerColor;
     LLColor4 mLindenColor;
     LLColor4 mMutedColor;
+	LLColor4 mCustomColor;
 	bool mColorFriendChat;
 	bool mColorEOChat;
 	bool mColorLindenChat;
 	bool mColorMutedChat;
+//	bool mColorCustomChat;
     //Body Dynamics
     BOOL mBreastPhysicsToggle;
     F32 mBoobMass;

indra/newview/skins/default/xui/en-us/panel_preferences_ascent_vanity.xml

@@ -42,11 +42,13 @@
       <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom_delta="0" can_apply_immediately="true" color="1 1 1 1" control_name="AscentEstateOwnerColor" follows="top" height="47" label="Estate" left_delta="54" name="estate_owner_color_swatch" width="44" tool_tip="Color of Estate Managers"/>
       <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom_delta="0" can_apply_immediately="true" color="0.6 0.6 1 1" control_name="AscentLindenColor" follows="top" height="47" label="Lindens" left_delta="54" name="linden_color_swatch" width="44" tool_tip="Color of Lindens"/>
       <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom_delta="0" can_apply_immediately="true" color="0.8 1 1 1" control_name="AscentMutedColor" follows="top" height="47" label="Muted" left_delta="54" name="muted_color_swatch" width="44" tool_tip="Color of Muted"/>
+      <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom_delta="0" can_apply_immediately="true" color="0.375 1 1 1" control_name="MoyMiniMapCustomColor" follows="top" height="47" label="Custom (Minimap)" left_delta="54" name="custom_color_swatch" width="44" tool_tip="Color of users picked out on the minimap only"/>
       <text bottom_delta="-9" follows="top" height="10" left="20" name="chat_color_text">Use colors for chat:</text>
       <check_box bottom_delta="-7" control_name="ColorFriendChat" follows="top" height="20" label="" left_delta="150" name="color_friend_check" width="44" tool_tip="Color Friend Chat"/>
       <check_box bottom_delta="0" control_name="ColorEstateOwnerChat" follows="top" height="20" label="" left_delta="54" name="color_estate_owner_check" width="44" tool_tip="Color Estate Managers Chat"/>
       <check_box bottom_delta="0" control_name="ColorLindenChat" follows="top" height="20" label="" left_delta="54" name="color_linden_check" width="44" tool_tip="Color Linden Chat"/>
       <check_box bottom_delta="0" control_name="ColorMutedChat" follows="top" height="20" label="" left_delta="54" name="color_muted_check" width="44" tool_tip="Color Muted Chat"/>
+      <!--check_box bottom_delta="0" control_name="ColorCustomChat" follows="top" height="20" label="" left_delta="54" name="color_custom_check" width="44" tool_tip="Color Custom Chat"/ Not implemented, yet.-->
     </panel>
     <panel border="true" left="1" bottom="-190" height="180" width="500" label="Body Dynamics" name="Body Dynamics">
       <check_box bottom_delta="-25" follows="top" height="16" label="Enable enhanced physics on avatar breasts" left="10" name="EmBreastsToggle" control_name="EmeraldBreastPhysicsToggle" tool_tip="You must hit apply before these controls will activate or deactivate"/>