1. simon_linden
  2. viewer-rabbit

Commits

nat_linden  committed c4403da

Fix LLMachineID::getUniqueID() LL_DEBUGS log output.
getUniqueID() was logging six somewhat random bytes as garbage characters.
Change to produce a hex string instead.

  • Participants
  • Parent commits e79766d
  • Branches default

Comments (0)

Files changed (1)

File indra/newview/llmachineid.cpp

View file
     if (has_static_unique_id)
     {
         memcpy ( unique_id, &static_unique_id, len);
-        LL_DEBUGS("AppInit") << "UniqueID: " << unique_id[0] << unique_id[1]<< unique_id[2] << unique_id[3] << unique_id[4] << unique_id [5] << LL_ENDL;
+        LL_DEBUGS("AppInit") << "UniqueID: 0x";
+        // Code between here and LL_ENDL is not executed unless the LL_DEBUGS
+        // actually produces output
+        for (size_t i = 0; i < len; ++i)
+        {
+            // Copy each char to unsigned int to hexify. Sending an unsigned
+            // char to a std::ostream tries to represent it as a char, not
+            // what we want here.
+            unsigned byte = unique_id[i];
+            LL_CONT << std::hex << std::setw(2) << std::setfill('0') << byte;
+        }
+        LL_ENDL;
         return 1;
     }
     return 0;