diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2013-05-13 10:11:12 -0600 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2013-05-13 10:11:12 -0600 |
| commit | bbefabff3e2f3453ac682262defe0e7f9b94d5a8 (patch) | |
| tree | de31849d3749f29b60a4455bbaeff05cc70d00b1 /indra/newview/llvieweroctree.cpp | |
| parent | edf731c180a61dc49255ebb25342b6256e8d6065 (diff) | |
| parent | 6244679b34bfb450bc83fd1ccd8c765028bb6735 (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-interesting
Diffstat (limited to 'indra/newview/llvieweroctree.cpp')
| -rw-r--r-- | indra/newview/llvieweroctree.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llvieweroctree.cpp b/indra/newview/llvieweroctree.cpp index 0fa1f5bef3..0670b47f52 100644 --- a/indra/newview/llvieweroctree.cpp +++ b/indra/newview/llvieweroctree.cpp @@ -525,7 +525,7 @@ void LLviewerOctreeGroup::handleChildAddition(const OctreeNode* parent, OctreeNo } else { - OCT_ERRS << "LLSpatialGroup redundancy detected." << llendl; + OCT_ERRS << "LLviewerOctreeGroup redundancy detected." << llendl; } unbound(); |