diff --git a/OpenSim/Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.cs
index c1ebc5fa4f..b23b4136e8 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.cs
@@ -154,6 +154,8 @@ namespace OpenSim.Region.ClientStack.Linden
 
                 m_features["MaxTextureResolution"] = OSD.FromInteger(Constants.MaxTextureResolution);
 
+                m_features["MaxProfilePicks"] = OSD.FromInteger(Constants.MaxProfilePicks);
+
                 m_features["MeshRezEnabled"] = true;
                 m_features["MeshUploadEnabled"] = true;
                 m_features["MeshXferEnabled"] = true;
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index 6b90e6095c..d1c6071633 100755
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -4214,7 +4214,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 for(int i = 0; i < npicks; ++i)
                 {
                     KeyValuePair<UUID, string> pick = spicks[i];
-                    ap.Data[i++] = new AvatarPicksReplyPacket.DataBlock
+                    ap.Data[i] = new AvatarPicksReplyPacket.DataBlock
                     {
                         PickID = pick.Key,
                         PickName = Utils.StringToBytes(pick.Value, maxtrlen)