diff options
Diffstat (limited to 'indra/newview/llpanelplaceinfo.cpp')
| -rw-r--r-- | indra/newview/llpanelplaceinfo.cpp | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/indra/newview/llpanelplaceinfo.cpp b/indra/newview/llpanelplaceinfo.cpp index 99e48cca6d..8c1f5d0915 100644 --- a/indra/newview/llpanelplaceinfo.cpp +++ b/indra/newview/llpanelplaceinfo.cpp @@ -60,8 +60,7 @@ LLPanelPlaceInfo::LLPanelPlaceInfo() mScrollingPanelWidth(0), mInfoType(UNKNOWN), mScrollingPanel(NULL), - mScrollContainer(NULL), - mDescEditor(NULL) + mScrollContainer(NULL) {} //virtual @@ -249,16 +248,6 @@ void LLPanelPlaceInfo::processParcelInfo(const LLParcelData& parcel_data) // virtual void LLPanelPlaceInfo::reshape(S32 width, S32 height, BOOL called_from_parent) { - - // This if was added to force collapsing description textbox on Windows at the beginning of reshape - // (the only case when reshape is skipped here is when it's caused by this textbox, so called_from_parent is FALSE) - // This way it is consistent with Linux where topLost collapses textbox at the beginning of reshape. - // On windows it collapsed only after reshape which caused EXT-8342. - if(called_from_parent) - { - if(mDescEditor) mDescEditor->onTopLost(); - } - LLPanel::reshape(width, height, called_from_parent); if (!mScrollContainer || !mScrollingPanel) |