diff options
| author | Todd Stinson <stinson@lindenlab.com> | 2012-04-25 15:27:13 -0700 |
|---|---|---|
| committer | Todd Stinson <stinson@lindenlab.com> | 2012-04-25 15:27:13 -0700 |
| commit | ee230730c55a82e588c0bd1c98ff75f60f7f6427 (patch) | |
| tree | 6a89fb8eea71e99267c7136a72e96106c0fa12cb /indra/llui | |
| parent | 857259f85228d0ff4858db9a5942b614b84b0f91 (diff) | |
| parent | d6569db3520f7e0ce2d93febb6f4e26b48c08a3d (diff) | |
Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-release.
Diffstat (limited to 'indra/llui')
| -rw-r--r-- | indra/llui/llnotifications.h | 2 |
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). |