Index: branches/BNC_2.12/src/upload/bncrtnetuploadcaster.cpp
===================================================================
--- branches/BNC_2.12/src/upload/bncrtnetuploadcaster.cpp	(revision 8806)
+++ branches/BNC_2.12/src/upload/bncrtnetuploadcaster.cpp	(revision 8807)
@@ -2406,5 +2406,9 @@
         }
       }
-      int mmsg = (co.NumberOfSat[CLOCKORBIT_SATGLONASS] > 0) ? 1 : 0;
+      int mmsg = (co.NumberOfSat[CLOCKORBIT_SATGLONASS] > 0 ||
+                  co.NumberOfSat[CLOCKORBIT_SATGALILEO] > 0 ||
+                  co.NumberOfSat[CLOCKORBIT_SATQZSS]    > 0 ||
+                  co.NumberOfSat[CLOCKORBIT_SATSBAS]    > 0 ||
+                  co.NumberOfSat[CLOCKORBIT_SATBDS]     > 0   ) ? 1 : 0;
       int len2 = MakeClockOrbit(&co, COTYPE_GPSCLOCK, mmsg, obuffer,
           sizeof(obuffer));
@@ -2424,5 +2428,8 @@
         }
       }
-      int mmsg = (co.NumberOfSat[CLOCKORBIT_SATGALILEO] > 0) ? 1 : 0;
+      int mmsg = (co.NumberOfSat[CLOCKORBIT_SATGALILEO] > 0 ||
+                  co.NumberOfSat[CLOCKORBIT_SATQZSS]    > 0 ||
+                  co.NumberOfSat[CLOCKORBIT_SATSBAS]    > 0 ||
+                  co.NumberOfSat[CLOCKORBIT_SATBDS]     > 0   ) ? 1 : 0;
       int len2 = MakeClockOrbit(&co, COTYPE_GLONASSCLOCK, mmsg, obuffer,
           sizeof(obuffer));
@@ -2442,5 +2449,7 @@
         }
       }
-      int mmsg = (co.NumberOfSat[CLOCKORBIT_SATQZSS] > 0) ? 1 : 0;
+      int mmsg = (co.NumberOfSat[CLOCKORBIT_SATQZSS]    > 0 ||
+                  co.NumberOfSat[CLOCKORBIT_SATSBAS]    > 0 ||
+                  co.NumberOfSat[CLOCKORBIT_SATBDS]     > 0   ) ? 1 : 0;
       int len2 = MakeClockOrbit(&co, COTYPE_GALILEOCLOCK, mmsg, obuffer,
           sizeof(obuffer));
@@ -2460,5 +2469,6 @@
         }
       }
-      int mmsg = (co.NumberOfSat[CLOCKORBIT_SATSBAS] > 0) ? 1 : 0;
+      int mmsg = (co.NumberOfSat[CLOCKORBIT_SATSBAS]    > 0 ||
+                  co.NumberOfSat[CLOCKORBIT_SATBDS]     > 0   ) ? 1 : 0;
       int len2 = MakeClockOrbit(&co, COTYPE_QZSSCLOCK, mmsg, obuffer,
           sizeof(obuffer));
@@ -2496,5 +2506,6 @@
         }
       }
-      int len2 = MakeClockOrbit(&co, COTYPE_BDSCLOCK, 0, obuffer,
+      int mmsg = 0;
+      int len2 = MakeClockOrbit(&co, COTYPE_BDSCLOCK, mmsg, obuffer,
           sizeof(obuffer));
       if (len2 > 0) {