diff options
| author | Aaron Brashears <aaronb@lindenlab.com> | 2007-06-13 18:02:37 +0000 |
|---|---|---|
| committer | Aaron Brashears <aaronb@lindenlab.com> | 2007-06-13 18:02:37 +0000 |
| commit | f118e7c80b95d8c0a0c8abb14ff379b6697e01b6 (patch) | |
| tree | db55a74f8d18b3c366608a537e2a32f6d089d56f /indra/llmessage/llcachename.cpp | |
| parent | 680667d4bdca7e2a6df15cd6f16f34c12c97da8e (diff) | |
result of merge manually performed through diff and patch. svn diff svn+ssh://svn/svn/linden/release@63615 svn+ssh://svn/svn/linden/branches/release-candidate@63637 | patch -p0 in release
Diffstat (limited to 'indra/llmessage/llcachename.cpp')
| -rw-r--r-- | indra/llmessage/llcachename.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/llmessage/llcachename.cpp b/indra/llmessage/llcachename.cpp index b2e1500859..9c6e5e7f85 100644 --- a/indra/llmessage/llcachename.cpp +++ b/indra/llmessage/llcachename.cpp @@ -623,6 +623,12 @@ void LLCacheName::dumpStats() << llendl; } +//static +LLString LLCacheName::getDefaultName() +{ + return LLString(CN_WAITING); +} + void LLCacheName::Impl::processPendingAsks() { sendRequest(_PREHASH_UUIDNameRequest, mAskNameQueue); |