summaryrefslogtreecommitdiff
path: root/indra/llmessage
diff options
context:
space:
mode:
authorbrad kittenbrink <brad@lindenlab.com>2009-09-09 11:43:35 -0400
committerbrad kittenbrink <brad@lindenlab.com>2009-09-09 11:43:35 -0400
commit9c5cc00998e240f4bc6061830a162e3daa1d2f81 (patch)
tree08288ab4caf6670105de119d7d6a415b69360e8b /indra/llmessage
parent5669597e1803f24ee2ea452a792ecf35deffaee8 (diff)
parent11d10bd53aa14a7a18ffb40a5195e95f4e108c21 (diff)
Merged parabuild work and trunk with nat's latest linux linkage and LSL tests fixes.
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.