diff options
author | simon <none@none> | 2014-06-17 10:40:42 -0700 |
---|---|---|
committer | simon <none@none> | 2014-06-17 10:40:42 -0700 |
commit | 592024b5805a116c9d0bef893127427df0741b41 (patch) | |
tree | bcadc0685873b40e23254cf3d6232e8f1f3f0e1b /indra/newview/llpanellandmarks.cpp | |
parent | 9e855b03b7f285794520eaf781b6a963b6cd51d9 (diff) | |
parent | 977476171ddcc057d7c28b6c14ae988b8189ed75 (diff) |
Merge viewer-release and become version 3.7.9
Diffstat (limited to 'indra/newview/llpanellandmarks.cpp')
-rwxr-xr-x | indra/newview/llpanellandmarks.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llpanellandmarks.cpp b/indra/newview/llpanellandmarks.cpp index 8da4948628..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; } |