diff options
| author | Roxie Linden <roxie@lindenlab.com> | 2010-04-21 14:22:49 -0700 |
|---|---|---|
| committer | Roxie Linden <roxie@lindenlab.com> | 2010-04-21 14:22:49 -0700 |
| commit | c139e52a5bf1ca2273d4fd22f28f55b12ba8a2d7 (patch) | |
| tree | d18b60262d24c69cb8d12d795b5dd700f4384148 /indra/newview/llvoicevivox.cpp | |
| parent | 270d13388223b641b3746000209c2c55c5fb641d (diff) | |
Remove diamondware and rearrange login panel to be like it is in the default viewer 2 build
Diffstat (limited to 'indra/newview/llvoicevivox.cpp')
| -rw-r--r-- | indra/newview/llvoicevivox.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llvoicevivox.cpp b/indra/newview/llvoicevivox.cpp index bb657841c4..dbecf11597 100644 --- a/indra/newview/llvoicevivox.cpp +++ b/indra/newview/llvoicevivox.cpp @@ -4797,7 +4797,7 @@ std::string LLVivoxVoiceClient::nameFromID(const LLUUID &uuid) LLStringUtil::replaceChar(result, '_', ' '); return result; } - // Prepending this apparently prevents conflicts with reserved names inside the vivox and diamondware code. + // Prepending this apparently prevents conflicts with reserved names inside the vivox code. result = "x"; // Base64 encode and replace the pieces of base64 that are less compatible |