diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2010-02-18 10:59:09 -0800 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2010-02-18 10:59:09 -0800 |
| commit | 4ab945c9f0000ead1eca22eefe0829bf3c15d7da (patch) | |
| tree | 79edcee8dd21487474a37cca9ca433a073e52ae3 /indra/llui/llresizehandle.cpp | |
| parent | 7f432e085809a354ce0599c53c8f1f1eec52e18e (diff) | |
| parent | 2231da11dd4b69a94a781e2cbb0cc980f9bdd474 (diff) | |
Merge - updating from hotfix
Diffstat (limited to 'indra/llui/llresizehandle.cpp')
| -rw-r--r-- | indra/llui/llresizehandle.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/llui/llresizehandle.cpp b/indra/llui/llresizehandle.cpp index 3df09d124a..367666efbd 100644 --- a/indra/llui/llresizehandle.cpp +++ b/indra/llui/llresizehandle.cpp @@ -136,9 +136,10 @@ BOOL LLResizeHandle::handleHover(S32 x, S32 y, MASK mask) if( resizing_view ) { // undock floater when user resize it - if (((LLFloater*)getParent())->isDocked()) + LLFloater* floater_parent = dynamic_cast<LLFloater*>(getParent()); + if (floater_parent && floater_parent->isDocked()) { - ((LLFloater*)getParent())->setDocked(false, false); + floater_parent->setDocked(false, false); } // Resize the parent |