diff options
| author | Seth ProductEngine <slitovchuk@productengine.com> | 2012-02-23 21:02:46 +0200 |
|---|---|---|
| committer | Seth ProductEngine <slitovchuk@productengine.com> | 2012-02-23 21:02:46 +0200 |
| commit | a5e4b15b7d29a64781eb32ef71e557a5bb8dc870 (patch) | |
| tree | 8c25d883a4480b02148289a4bc9d3ecdc1805a64 /indra/llui | |
| parent | c37b3dde541805afe29ce3297ec5416ba3609127 (diff) | |
Linux build fix.
Moved type casts from protected base classes to derived LLCoord.
Diffstat (limited to 'indra/llui')
| -rw-r--r-- | indra/llui/llfloater.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp index 3afa1b8e3a..2a40bbf33c 100644 --- a/indra/llui/llfloater.cpp +++ b/indra/llui/llfloater.cpp @@ -3306,7 +3306,7 @@ bool LLCoordFloater::operator==(const LLCoordFloater& other) const LLCoordCommon LL_COORD_FLOATER::convertToCommon() const { - const LLCoordFloater& self = static_cast<const LLCoordFloater&>(*this); + const LLCoordFloater& self = static_cast<const LLCoordFloater&>(LLCoordFloater::getTypedCoords(*this)); LLRect snap_rect = gFloaterView->getSnapRect(); LLFloater* floaterp = mFloater.get(); @@ -3348,7 +3348,7 @@ LLCoordCommon LL_COORD_FLOATER::convertToCommon() const void LL_COORD_FLOATER::convertFromCommon(const LLCoordCommon& from) { - LLCoordFloater& self = static_cast<LLCoordFloater&>(*this); + LLCoordFloater& self = static_cast<LLCoordFloater&>(LLCoordFloater::getTypedCoords(*this)); LLRect snap_rect = gFloaterView->getSnapRect(); LLFloater* floaterp = mFloater.get(); S32 floater_width = floaterp ? floaterp->getRect().getWidth() : 0; |