Specific images override generic images.

git-svn-id: http://svn.igniterealtime.org/svn/repos/messenger/trunk@1676 b35dd754-fafc-0310-a699-88a17e54d16e

src/plugins/presence/src/java/org/jivesoftware/messenger/plugin/presence/ImagePresenceProvider.java

@@ -89,12 +89,12 @@ class ImagePresenceProvider extends PresenceInfoProvider {
     private void writeImageContent(HttpServletRequest request, HttpServletResponse response,
             String presenceType, byte[] defaultImage) throws IOException {
         String images = request.getParameter("images");
-        if (images != null) {
-            writeImageContent(images.replace("${presence}", presenceType), defaultImage, response);
-        }
-        else if (request.getParameter(presenceType) != null) {
+        if (request.getParameter(presenceType) != null) {
             writeImageContent(request.getParameter(presenceType), defaultImage, response);
         }
+        else if (images != null) {
+            writeImageContent(images.replace("${presence}", presenceType), defaultImage, response);
+        }
         else {
             writeImageContent(null, defaultImage, response);
         }