summaryrefslogtreecommitdiff
path: root/indra/llmessage
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2009-09-10 14:18:14 -0700
committerNat Goodspeed <nat@lindenlab.com>2009-09-10 14:18:14 -0700
commit03a23fd2449c72391055311f7d6563985543d34f (patch)
tree9f1884c65625f4869af623749bec8f76cd2bd1b1 /indra/llmessage
parent2a446ab558f039db4a863f3d287f2ec2369ec8c3 (diff)
parent9c5cc00998e240f4bc6061830a162e3daa1d2f81 (diff)
Merge changes
Diffstat (limited to 'indra/llmessage')
-rw-r--r--indra/llmessage/llcachename.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llmessage/llcachename.cpp b/indra/llmessage/llcachename.cpp
index a4304596de..a403c44b71 100644
--- a/indra/llmessage/llcachename.cpp
+++ b/indra/llmessage/llcachename.cpp
@@ -551,7 +551,7 @@ BOOL LLCacheName::getGroupName(const LLUUID& id, std::string& group)
// This is a little bit kludgy. LLCacheNameCallback is a slot instead of a function pointer.
// The reason it is a slot is so that the legacy get() function below can bind an old callback
// and pass it as a slot. The reason it isn't a boost::function is so that trackable behavior
-// deson't get lost. As a result, we have to bind the slot to a signal to call it, even when
+// doesn't get lost. As a result, we have to bind the slot to a signal to call it, even when
// we call it immediately. -Steve
// NOTE: Even though passing first and last name is a bit of extra overhead, it eliminates the
// potential need for any parsing should any code need to handle first and last name independently.