diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2009-11-10 16:20:07 -0500 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2009-11-10 16:20:07 -0500 |
| commit | 65d8b9cfe56bb1bd62ee4ceabffa617e751b02d0 (patch) | |
| tree | 8d8469a82d7f2239092a80b7eee4fc15c7b68d7d | |
| parent | 9630ce2f02df70d180270067cc20623ec1f6de28 (diff) | |
Make LLInstanceTracker a public base of LLLayoutStack.
Qualify instance_iter with LLLayoutStack:: rather than having to restate the
template params to LLInstanceTracker.
| -rw-r--r-- | indra/llui/lllayoutstack.cpp | 4 | ||||
| -rw-r--r-- | indra/llui/lllayoutstack.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/indra/llui/lllayoutstack.cpp b/indra/llui/lllayoutstack.cpp index 5999e1a29e..14a6ddb7e0 100644 --- a/indra/llui/lllayoutstack.cpp +++ b/indra/llui/lllayoutstack.cpp @@ -792,8 +792,8 @@ void LLLayoutStack::calcMinExtents() //static void LLLayoutStack::updateClass() { - for (LLInstanceTracker::instance_iter it = beginInstances(); it != endInstances(); ++it) + for (LLLayoutStack::instance_iter it = beginInstances(); it != endInstances(); ++it) { - (*it)->updateLayout(); + it->updateLayout(); } } diff --git a/indra/llui/lllayoutstack.h b/indra/llui/lllayoutstack.h index 8475079f5e..3a073fa1b2 100644 --- a/indra/llui/lllayoutstack.h +++ b/indra/llui/lllayoutstack.h @@ -38,7 +38,7 @@ class LLPanel; -class LLLayoutStack : public LLView, LLInstanceTracker<LLLayoutStack> +class LLLayoutStack : public LLView, public LLInstanceTracker<LLLayoutStack> { public: struct Params : public LLInitParam::Block<Params, LLView::Params> |