diff options
| author | Chris Baker <baker@lindenlab.com> | 2014-06-16 21:15:41 +0000 |
|---|---|---|
| committer | Chris Baker <baker@lindenlab.com> | 2014-06-16 21:15:41 +0000 |
| commit | ee14005a2aea89b2988fa0a5060f38b669e45389 (patch) | |
| tree | 3b9930089be344a9c25172f3ca4be0fbf412ba17 /indra/newview/llpanellandmarks.cpp | |
| parent | a92dbb592b338f48f7b75b68a9da511dc95279f9 (diff) | |
| parent | 977476171ddcc057d7c28b6c14ae988b8189ed75 (diff) | |
viewer-release merge
Diffstat (limited to 'indra/newview/llpanellandmarks.cpp')
| -rwxr-xr-x | indra/newview/llpanellandmarks.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/indra/newview/llpanellandmarks.cpp b/indra/newview/llpanellandmarks.cpp index b941ee1f1b..67cbc91332 100755 --- a/indra/newview/llpanellandmarks.cpp +++ b/indra/newview/llpanellandmarks.cpp @@ -527,7 +527,7 @@ void LLLandmarksPanel::setParcelID(const LLUUID& parcel_id) } // virtual -void LLLandmarksPanel::setErrorStatus(U32 status, const std::string& reason) +void LLLandmarksPanel::setErrorStatus(S32 status, const std::string& reason) { LL_WARNS() << "Can't handle remote parcel request."<< " Http Status: "<< status << ". Reason : "<< reason<<LL_ENDL; } @@ -716,6 +716,11 @@ void LLLandmarksPanel::updateListCommands() mListCommands->getChildView(TRASH_BUTTON_NAME)->setEnabled(trash_enabled); } +void LLLandmarksPanel::updateMenuVisibility(LLUICtrl* menu) +{ + onMenuVisibilityChange(menu, LLSD().with("visibility", true)); +} + void LLLandmarksPanel::onActionsButtonClick() { LLToggleableMenu* menu = mGearFolderMenu; |