summaryrefslogtreecommitdiff
path: root/indra/llui/llnotifications.h
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2012-05-02 13:00:59 -0400
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2012-05-02 13:00:59 -0400
commit678864e4ed497de7d17e02fa79b93be54379a5b8 (patch)
treef946f0f5ffc116d2ba9c9ada237eb70594966ee6 /indra/llui/llnotifications.h
parent78fec489b53434a8ac8f9c0a8e72fd883067ce42 (diff)
parentd6569db3520f7e0ce2d93febb6f4e26b48c08a3d (diff)
merge viewer-release to drano
Diffstat (limited to 'indra/llui/llnotifications.h')
-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).