summaryrefslogtreecommitdiff
path: root/indra/llui
diff options
context:
space:
mode:
authorprep <prep@lindenlab.com>2012-04-26 13:15:30 -0400
committerprep <prep@lindenlab.com>2012-04-26 13:15:30 -0400
commit8443190b66bf81f7e33b10abb6e2ab1250c68ba4 (patch)
tree4643bcea751082beee58bfbe795ac7194fc31a77 /indra/llui
parent447a6ced446e233027eef0423e2c68870a51c506 (diff)
parentee230730c55a82e588c0bd1c98ff75f60f7f6427 (diff)
merge
Diffstat (limited to 'indra/llui')
-rw-r--r--indra/llui/llnotifications.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llui/llnotifications.h b/indra/llui/llnotifications.h
index 462d69be2e..3df2efcac3 100644
--- a/indra/llui/llnotifications.h
+++ b/indra/llui/llnotifications.h
@@ -690,7 +690,7 @@ typedef std::multimap<std::string, LLNotificationPtr> LLNotificationMap;
// Abstract base class (interface) for a channel; also used for the master container.
// This lets us arrange channels into a call hierarchy.
-// We maintain a heirarchy of notification channels; events are always started at the top
+// We maintain a hierarchy of notification channels; events are always started at the top
// and propagated through the hierarchy only if they pass a filter.
// Any channel can be created with a parent. A null parent (empty string) means it's
// tied to the root of the tree (the LLNotifications class itself).