summaryrefslogtreecommitdiff
path: root/indra/llcommon/llerror.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-08-25 13:27:52 -0400
committerOz Linden <oz@lindenlab.com>2011-08-25 13:27:52 -0400
commit4057afd29161ad9cb69674ee608e48bc9e46a559 (patch)
tree058c53cb19d9b3e85fb0f9b70623c563704cdf17 /indra/llcommon/llerror.cpp
parent0f1dea30f827f920d2323d9450826f1a4baaa10b (diff)
parent7c222dfd136a4bb97700b390f8adbef6fe67cf5d (diff)
merge changes for storm-1268
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
*/