summaryrefslogtreecommitdiff
path: root/indra/llmath/lloctree.h
diff options
context:
space:
mode:
authorMonty Brandenberg <monty@lindenlab.com>2013-01-09 16:39:30 -0500
committerMonty Brandenberg <monty@lindenlab.com>2013-01-09 16:39:30 -0500
commitcc0a4bf6acafe759baaccea65022c963373ea012 (patch)
treed4fe1f1e34b1ab0d140a37c1f80d09034824d3e8 /indra/llmath/lloctree.h
parent11e506f2eb979a5ddfc3ca6f9c626771ab012a78 (diff)
parentcdd45b9abb35b40f2a31e7433fb99e588df8b40b (diff)
Merge. Pull viewer-development in prior to filing DRTVWR merge request.
Diffstat (limited to 'indra/llmath/lloctree.h')
-rw-r--r--indra/llmath/lloctree.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llmath/lloctree.h b/indra/llmath/lloctree.h
index 4ac1e55cfc..7348904c61 100644
--- a/indra/llmath/lloctree.h
+++ b/indra/llmath/lloctree.h
@@ -78,7 +78,7 @@ public:
typedef LLOctreeTraveler<T> oct_traveler;
typedef LLTreeTraveler<T> tree_traveler;
- typedef std::vector<LLPointer<T> > element_list;
+ typedef std::vector< LLPointer<T> > element_list; // note: don't remove the whitespace between "> >"
typedef LLPointer<T>* element_iter;
typedef const LLPointer<T>* const_element_iter;
typedef typename std::vector<LLTreeListener<T>*>::iterator tree_listener_iter;