diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2009-08-14 22:40:13 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2009-08-14 22:40:13 +0000 |
| commit | 3b65da1fad46eda2c97681879fce8880f7462082 (patch) | |
| tree | 9c9a5b69ea5f3d90883c39acdd0f856e75105fd1 /indra/newview/llpanelplaceinfo.cpp | |
| parent | 73caee4208a4e05f66583de099502012fd8415ea (diff) | |
merge -r 1341-1350 https://svn.aws.productengine.com/secondlife/pe/stable-1 -> viewer-2.0.0-3
EXT-456 EXT-480 EXT-481 EXT-497 EXT-498 EXT-509 EXT-511
Diffstat (limited to 'indra/newview/llpanelplaceinfo.cpp')
| -rw-r--r-- | indra/newview/llpanelplaceinfo.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/llpanelplaceinfo.cpp b/indra/newview/llpanelplaceinfo.cpp index 0931333ed9..34feb0f5a9 100644 --- a/indra/newview/llpanelplaceinfo.cpp +++ b/indra/newview/llpanelplaceinfo.cpp @@ -240,10 +240,7 @@ void LLPanelPlaceInfo::setParcelID(const LLUUID& parcel_id) } void LLPanelPlaceInfo::setInfoType(INFO_TYPE type) -{ - if (type != PLACE) - toggleMediaPanel(FALSE); - +{ bool is_landmark_info_type = type == LANDMARK; LLPanel* landmark_info_panel = getChild<LLPanel>("landmark_info_panel"); if (landmark_info_panel) @@ -276,6 +273,9 @@ void LLPanelPlaceInfo::setInfoType(INFO_TYPE type) mCurrentTitle = getString("title_place"); break; } + + if (type != PLACE) + toggleMediaPanel(FALSE); } BOOL LLPanelPlaceInfo::isMediaPanelVisible() |