diff options
author | Simon Linden <simon@lindenlab.com> | 2014-07-18 22:28:33 +0000 |
---|---|---|
committer | Simon Linden <simon@lindenlab.com> | 2014-07-18 22:28:33 +0000 |
commit | 7714c7679da7c6c28c3f3f09af6b586a680dc26c (patch) | |
tree | f14c766b090f50cbb866123305f676e831ef483b /indra/newview/llpanellandmarks.cpp | |
parent | 1655887f30e40ea390b6dca9f64ac5e84309be05 (diff) | |
parent | ff3827f278d2d53f565bc585edc4db5bc5e5dc38 (diff) |
Merge in downstream viewer-tiger
Diffstat (limited to 'indra/newview/llpanellandmarks.cpp')
-rwxr-xr-x | indra/newview/llpanellandmarks.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llpanellandmarks.cpp b/indra/newview/llpanellandmarks.cpp index 343f2b413f..75a3584a1e 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; } @@ -1263,6 +1263,7 @@ bool LLLandmarksPanel::handleDragAndDropToTrash(BOOL drop, EDragAndDropType carg break; } + updateVerbs(); return true; } |