summaryrefslogtreecommitdiff
path: root/indra/llcommon/llerror.cpp
diff options
context:
space:
mode:
authorprep linden <prep@lindenlab.com>2011-08-30 09:33:05 -0400
committerprep linden <prep@lindenlab.com>2011-08-30 09:33:05 -0400
commit6f2820bcd7b7ed06fefeca0e2c34c45ef77e4b62 (patch)
tree1ba73003f2b299d6ab1a2b968c5d15688be23692 /indra/llcommon/llerror.cpp
parent71ac45a28b238bac4ac0cf43ee85f04589ffa116 (diff)
parent8cef480b96dc779c5879f74224fb0a185ee550f2 (diff)
merge
Diffstat (limited to 'indra/llcommon/llerror.cpp')
-rw-r--r--indra/llcommon/llerror.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llcommon/llerror.cpp b/indra/llcommon/llerror.cpp
index bb64152407..c35799bbb9 100644
--- a/indra/llcommon/llerror.cpp
+++ b/indra/llcommon/llerror.cpp
@@ -379,7 +379,7 @@ namespace
{
/* This pattern, of returning a reference to a static function
variable, is to ensure that this global is constructed before
- it is used, no matter what the global initializeation sequence
+ it is used, no matter what the global initialization sequence
is.
See C++ FAQ Lite, sections 10.12 through 10.14
*/