diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp
index f0752b7a54f6101ddc19337e6fddb9f56b605776..3ad195db96afacd644f0499b1aeb638d20e9b18c 100644
--- a/indra/llui/llfloater.cpp
+++ b/indra/llui/llfloater.cpp
@@ -2367,7 +2367,10 @@ void LLFloaterView::reshape(S32 width, S32 height, BOOL called_from_parent)
for (LLView* viewp : *getChildList())
{
- LLFloater* floaterp = dynamic_cast<LLFloater*>(viewp);
+ if (!viewp->isFloater())
+ continue;
+
+ LLFloater* floaterp = static_cast<LLFloater*>(viewp);
if (floaterp->isDependent())
{
// dependents are moved with their "dependee"
@@ -2425,7 +2428,10 @@ void LLFloaterView::restoreAll()
child_list_t child_list = *(getChildList()); // Copy as list order can change during visibility
for (LLView* viewp : child_list)
{
- LLFloater* floaterp = dynamic_cast<LLFloater*>(viewp);
+ if (!viewp->isFloater())
+ continue;
+
+ LLFloater* floaterp = static_cast<LLFloater*>(viewp);
if (floaterp)
{
floaterp->setMinimized(FALSE);
@@ -2530,7 +2536,10 @@ void LLFloaterView::bringToFront(LLFloater* child, BOOL give_focus, BOOL restore
// Look at all floaters...tab
for (LLView* childp : *getChildList())
{
- LLFloater* floater = dynamic_cast<LLFloater*>(childp);
+ if (!childp->isFloater())
+ continue;
+
+ LLFloater* floater = static_cast<LLFloater*>(childp);
// ...but if I'm a dependent floater...
if (floater && child->isDependent())
@@ -2693,12 +2702,13 @@ void LLFloaterView::getMinimizePosition(S32 *left, S32 *bottom)
{
bool foundGap = TRUE;
- for(child_list_const_iter_t child_it = getChildList()->begin();
- child_it != getChildList()->end();
- ++child_it) //loop floaters
+ for(LLView* viewp : *getChildList()) //loop floaters
{
+ if (!viewp->isFloater())
+ continue;
+
// Examine minimized children.
- LLFloater* floater = dynamic_cast<LLFloater*>(*child_it);
+ LLFloater* floater = static_cast<LLFloater*>(viewp);
if(floater->isMinimized())
{
LLRect r = floater->getRect();
@@ -2744,6 +2754,9 @@ void LLFloaterView::closeAllChildren(bool app_quitting)
for (child_list_const_iter_t it = child_list.begin(); it != child_list.end(); ++it)
{
LLView* viewp = *it;
+ if (!viewp->isFloater())
+ continue;
+
child_list_const_iter_t exists = std::find(getChildList()->begin(), getChildList()->end(), viewp);
if (exists == getChildList()->end())
{
@@ -2751,7 +2764,7 @@ void LLFloaterView::closeAllChildren(bool app_quitting)
continue;
}
- LLFloater* floaterp = dynamic_cast<LLFloater*>(viewp);
+ LLFloater* floaterp = static_cast<LLFloater*>(viewp);
// Attempt to close floater. This will cause the "do you want to save"
// dialogs to appear.
@@ -2783,9 +2796,12 @@ void LLFloaterView::hideAllFloaters()
{
child_list_t child_list = *(getChildList());
- for (child_list_iter_t it = child_list.begin(); it != child_list.end(); ++it)
+ for (LLView* viewp : child_list)
{
- LLFloater* floaterp = dynamic_cast<LLFloater*>(*it);
+ if (!viewp->isFloater())
+ continue;
+
+ LLFloater* floaterp = static_cast<LLFloater*>(viewp);
if (floaterp && floaterp->getVisible())
{
floaterp->setVisible(false);
@@ -2815,8 +2831,10 @@ BOOL LLFloaterView::allChildrenClosed()
// by setting themselves invisible)
for (LLView* viewp : *getChildList())
{
- LLFloater* floaterp = dynamic_cast<LLFloater*>(viewp);
+ if (!viewp->isFloater())
+ continue;
+ LLFloater* floaterp = static_cast<LLFloater*>(viewp);
if (floaterp->getVisible() && !floaterp->isDead() && floaterp->isCloseable())
{
return false;
@@ -2829,8 +2847,10 @@ void LLFloaterView::shiftFloaters(S32 x_offset, S32 y_offset)
{
for (LLView* viewp : *getChildList())
{
- LLFloater* floaterp = dynamic_cast<LLFloater*>(viewp);
+ if (!viewp->isFloater())
+ continue;
+ LLFloater* floaterp = static_cast<LLFloater*>(viewp);
if (floaterp && floaterp->isMinimized())
{
floaterp->translate(x_offset, y_offset);
@@ -2849,7 +2869,10 @@ void LLFloaterView::refresh()
// Constrain children to be entirely on the screen
for (LLView* viewp : *getChildList())
{
- LLFloater* floaterp = dynamic_cast<LLFloater*>(viewp);
+ if (!viewp->isFloater())
+ continue;
+
+ LLFloater* floaterp = static_cast<LLFloater*>(viewp);
if (floaterp && floaterp->getVisible() )
{
// minimized floaters are kept fully onscreen
@@ -2977,9 +3000,9 @@ LLFloater *LLFloaterView::getFocusedFloater() const
{
for (LLView* viewp : *getChildList())
{
- if (viewp->isCtrl())
+ if (viewp->isFloater())
{
- LLFloater* ctrlp = dynamic_cast<LLFloater*>(viewp);
+ LLFloater* ctrlp = static_cast<LLFloater*>(viewp);
if ( ctrlp && ctrlp->hasFocus() )
{
return ctrlp;
@@ -3046,9 +3069,13 @@ void LLFloaterView::syncFloaterTabOrder()
else
{
// otherwise, make sure the focused floater is in the front of the child list
- for ( child_list_const_reverse_iter_t child_it = getChildList()->rbegin(); child_it != getChildList()->rend(); ++child_it)
+ for ( child_list_const_reverse_iter_t child_it = getChildList()->rbegin(), end_it = getChildList()->rend(); child_it != end_it; ++child_it)
{
- LLFloater* floaterp = dynamic_cast<LLFloater*>(*child_it);
+ LLView* viewp = *child_it;
+ if (!viewp->isFloater())
+ continue;
+
+ LLFloater* floaterp = static_cast<LLFloater*>(*child_it);
if (gFocusMgr.childHasKeyboardFocus(floaterp))
{
bringToFront(floaterp, FALSE);
@@ -3068,9 +3095,9 @@ LLFloater* LLFloaterView::getParentFloater(LLView* viewp) const
parentp = parentp->getParent();
}
- if (parentp == this)
+ if (parentp == this && viewp->isFloater())
{
- return dynamic_cast<LLFloater*>(viewp);
+ return static_cast<LLFloater*>(viewp);
}
return NULL;
diff --git a/indra/llui/llfloater.h b/indra/llui/llfloater.h
index adc836618767e04761ffd86a52612bc5df07fb02..e18d734ab922858cb2c23242d5859d2867cef15b 100644
--- a/indra/llui/llfloater.h
+++ b/indra/llui/llfloater.h
@@ -208,6 +208,8 @@ class LLFloater : public LLPanel, public LLInstanceTracker<LLFloater>
virtual ~LLFloater();
+ bool isFloater() const override { return true; }
+
// Don't export top/left for rect, only height/width
static void setupParamsForExport(Params& p, LLView* parent);
bool buildFromFile(const std::string &filename);
diff --git a/indra/llui/llmenugl.cpp b/indra/llui/llmenugl.cpp
index 588232c792cd1ad7ab08a1929294ebd3ac9d6ead..8d9dacd3cb7b945c2d0a83a7b65740b1d9e80153 100644
--- a/indra/llui/llmenugl.cpp
+++ b/indra/llui/llmenugl.cpp
@@ -681,9 +681,9 @@ LLFloater* LLMenuItemTearOffGL::getParentFloater()
while (parent_view)
{
- if (dynamic_cast<LLFloater*>(parent_view))
+ if (parent_view->isFloater())
{
- return dynamic_cast<LLFloater*>(parent_view);
+ return static_cast<LLFloater*>(parent_view);
}
bool parent_is_menu = dynamic_cast<LLMenuGL*>(parent_view) && !dynamic_cast<LLMenuBarGL*>(parent_view);
diff --git a/indra/llui/llmultifloater.cpp b/indra/llui/llmultifloater.cpp
index d1a597511eff4dd85d91b559f82763f5b9d9fb1f..cd88a0d6b85d7ea1915d32ab3bb1279fe1fa15ef 100644
--- a/indra/llui/llmultifloater.cpp
+++ b/indra/llui/llmultifloater.cpp
@@ -429,10 +429,10 @@ void LLMultiFloater::setFloaterFlashing(LLFloater* floaterp, BOOL flashing)
void LLMultiFloater::onTabSelected()
{
- LLFloater* floaterp = dynamic_cast<LLFloater*>(mTabContainer->getCurrentPanel());
- if (floaterp)
+ LLPanel* cur_panel = mTabContainer->getCurrentPanel();
+ if (cur_panel->isFloater())
{
- tabOpen(floaterp, true);
+ tabOpen(static_cast<LLFloater*>(cur_panel), true);
}
}
diff --git a/indra/llui/llresizehandle.cpp b/indra/llui/llresizehandle.cpp
index 24794305ac0c42ba895b4a8930ab18c2d4e48623..db83a115ad876476118c739cb56314953f0e38f9 100644
--- a/indra/llui/llresizehandle.cpp
+++ b/indra/llui/llresizehandle.cpp
@@ -130,10 +130,13 @@ BOOL LLResizeHandle::handleHover(S32 x, S32 y, MASK mask)
if( resizing_view )
{
// undock floater when user resize it
- LLFloater* floater_parent = dynamic_cast<LLFloater*>(getParent());
- if (floater_parent && floater_parent->isDocked())
+ if (resizing_view->isFloater())
{
- floater_parent->setDocked(false, false);
+ LLFloater* floater_parent = static_cast<LLFloater*>(resizing_view);
+ if (floater_parent->isDocked())
+ {
+ floater_parent->setDocked(false, false);
+ }
}
// Resize the parent
diff --git a/indra/llui/lltextbase.cpp b/indra/llui/lltextbase.cpp
index 12b18fa0c9443a1896835bcbd9f38993ebefd2ac..f818fb8107d9ca9f3096b2e8bbf0289842b19725 100644
--- a/indra/llui/lltextbase.cpp
+++ b/indra/llui/lltextbase.cpp
@@ -637,7 +637,7 @@ void LLTextBase::drawCursor()
}
}
-void LLTextBase::drawText()
+void LLTextBase::drawText(const std::pair<S32, S32>& line_range)
{
S32 text_len = getLength();
@@ -659,7 +659,6 @@ void LLTextBase::drawText()
selection_right = llmax( mSelectionStart, mSelectionEnd );
}
- std::pair<S32, S32> line_range = getVisibleLines(mClipPartial);
S32 first_line = line_range.first;
S32 last_line = line_range.second;
if (first_line >= last_line)
@@ -1319,6 +1318,8 @@ void LLTextBase::draw()
updateScrollFromCursor();
}
+ std::pair<S32, S32> visible_lines = getVisibleLines(mClipPartial);
+
LLRect text_rect;
if (mScroller)
{
@@ -1327,8 +1328,7 @@ void LLTextBase::draw()
else
{
LLRect visible_lines_rect;
- std::pair<S32, S32> line_range = getVisibleLines(mClipPartial);
- for (S32 i = line_range.first; i < line_range.second; i++)
+ for (S32 i = visible_lines.first; i < visible_lines.second; i++)
{
if (visible_lines_rect.isEmpty())
{
@@ -1391,7 +1391,7 @@ void LLTextBase::draw()
drawHighlightsBackground(mHighlights, mHighlightedBGColor);
// [/SL:KB]
drawSelectionBackground();
- drawText();
+ drawText(visible_lines);
drawCursor();
}
diff --git a/indra/llui/lltextbase.h b/indra/llui/lltextbase.h
index e701796cb689220fdb35e06f16b4b8102ea8b941..79e2693ac2ee48d79d701a5c6ed515b4aafffc34 100644
--- a/indra/llui/lltextbase.h
+++ b/indra/llui/lltextbase.h
@@ -603,7 +603,7 @@ class LLTextBase
void drawHighlightsBackground(const highlight_list_t& highlights, const LLColor4& color);
// [/SL:KB]
void drawCursor();
- void drawText();
+ void drawText(const std::pair<S32, S32>& line_range);
// modify contents
S32 insertStringNoUndo(S32 pos, const LLWString &wstr, segment_vec_t* segments = NULL); // returns num of chars actually inserted
diff --git a/indra/llui/llview.h b/indra/llui/llview.h
index b9d0b8b63d18131b2a1a06083f28a9e9e33a4f55..7f0e54ddd6ed66f04a75e31ed203174a15ce2b36 100644
--- a/indra/llui/llview.h
+++ b/indra/llui/llview.h
@@ -217,6 +217,8 @@ class LLView
virtual BOOL isPanel() const;
+ virtual bool isFloater() const { return false; }
+
//
// MANIPULATORS
//