diff --git a/indra/llinventory/llinventory.cpp b/indra/llinventory/llinventory.cpp index 63fb034b6c58b7f3e1e0c974b640167a41c8f475..7bc6c507a950cddd6bf266aa60a0f43851d4dbce 100644 --- a/indra/llinventory/llinventory.cpp +++ b/indra/llinventory/llinventory.cpp @@ -779,8 +779,9 @@ BOOL LLInventoryItem::exportLegacyStream(std::ostream& output_stream, BOOL inclu const std::string inv_type_str = LLInventoryType::lookup(mInventoryType); if(!inv_type_str.empty()) output_stream << "\t\tinv_type\t" << inv_type_str << "\n"; - - output_stream << absl::StreamFormat("\t\tflags\t%08x\n", mFlags); + std::string buffer; + buffer = llformat( "\t\tflags\t%08x\n", mFlags); + output_stream << buffer; mSaleInfo.exportLegacyStream(output_stream); output_stream << "\t\tname\t" << mName.c_str() << "|\n"; output_stream << "\t\tdesc\t" << mDescription.c_str() << "|\n"; diff --git a/indra/llinventory/llpermissions.cpp b/indra/llinventory/llpermissions.cpp index 43b76e17e7cfbc3edae3f1fe65e353570faf39d6..0359d2f554ce9083133fb27d37163153a1c5b86f 100644 --- a/indra/llinventory/llpermissions.cpp +++ b/indra/llinventory/llpermissions.cpp @@ -672,11 +672,17 @@ BOOL LLPermissions::exportLegacyStream(std::ostream& output_stream) const output_stream << "\tpermissions 0\n"; output_stream << "\t{\n"; - output_stream << absl::StreamFormat("\t\tbase_mask\t%08x\n", mMaskBase); - output_stream << absl::StreamFormat("\t\towner_mask\t%08x\n", mMaskOwner); - output_stream << absl::StreamFormat("\t\tgroup_mask\t%08x\n", mMaskGroup); - output_stream << absl::StreamFormat("\t\teveryone_mask\t%08x\n", mMaskEveryone); - output_stream << absl::StreamFormat("\t\tnext_owner_mask\t%08x\n", mMaskNextOwner); + std::string buffer; + buffer = llformat( "\t\tbase_mask\t%08x\n", mMaskBase); + output_stream << buffer; + buffer = llformat( "\t\towner_mask\t%08x\n", mMaskOwner); + output_stream << buffer; + buffer = llformat( "\t\tgroup_mask\t%08x\n", mMaskGroup); + output_stream << buffer; + buffer = llformat( "\t\teveryone_mask\t%08x\n", mMaskEveryone); + output_stream << buffer; + buffer = llformat( "\t\tnext_owner_mask\t%08x\n", mMaskNextOwner); + output_stream << buffer; mCreator.toString(uuid_str); output_stream << "\t\tcreator_id\t" << uuid_str << "\n"; diff --git a/indra/llmessage/net.cpp b/indra/llmessage/net.cpp index e84fef5fdb1e238f5628cdb91db39fcdc04d27a3..e7b4e40f5b0e33cc23986fe27fb7316913b476db 100644 --- a/indra/llmessage/net.cpp +++ b/indra/llmessage/net.cpp @@ -275,8 +275,8 @@ S32 start_net(S32& socket_out, int& nPort) nRet = ioctlsocket (hSocket, FIONBIO, &argp); if (nRet == SOCKET_ERROR) { - LL_WARNS("AppInit") << absl::StreamFormat("Failed to set socket non-blocking, Err: %d", - WSAGetLastError()) << LL_ENDL; + printf("Failed to set socket non-blocking, Err: %d\n", + WSAGetLastError()); } // set a large receive buffer diff --git a/indra/llrender/llshadermgr.cpp b/indra/llrender/llshadermgr.cpp index 127f9ab27713ce7014370c08b32536c51d98ee9b..a6d55624b8778171e651b97f7479c0035ac589f5 100644 --- a/indra/llrender/llshadermgr.cpp +++ b/indra/llrender/llshadermgr.cpp @@ -588,11 +588,15 @@ static std::string get_program_log(GLuint ret) //dump shader source for debugging void LLShaderMgr::dumpShaderSource(U32 shader_code_count, GLchar** shader_code_text) { + char num_str[16]; // U32 = max 10 digits + LL_SHADER_LOADING_WARNS() << "\n"; for (U32 i = 0; i < shader_code_count; i++) { - LL_CONT << absl::StreamFormat("%4d: ", i + 1) << shader_code_text[i]; + snprintf(num_str, sizeof(num_str), "%4d: ", i+1); + std::string line_number(num_str); + LL_CONT << line_number << shader_code_text[i]; } LL_CONT << LL_ENDL; }