summaryrefslogtreecommitdiff
path: root/indra/llcommon/llerror.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-08-25 09:27:34 -0400
committerOz Linden <oz@lindenlab.com>2011-08-25 09:27:34 -0400
commite6239b7978fb9f05d2c8c7cf42b9277f4a5f7c52 (patch)
tree17080b4ffa8a59a5b9c158edaf9e60f9af2a67b4 /indra/llcommon/llerror.cpp
parent66cac05cfb1236c3c1607dff27babf873c29a679 (diff)
parent6484dbf28cb8b6ffa745fe9b26beae58d3c68441 (diff)
merge changes for storm-1571
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
*/