diff options
| author | simon <none@none> | 2014-06-18 19:02:25 -0700 |
|---|---|---|
| committer | simon <none@none> | 2014-06-18 19:02:25 -0700 |
| commit | d760a6889dbe1ca5ff0775343a6a01f735ec740b (patch) | |
| tree | 421a79d29dec1544c0347635113202a4bc7ba18a /indra/newview/llpanellandmarks.cpp | |
| parent | 3686dc3e37511009be02b61edcd483cb9a032b1b (diff) | |
| parent | 592024b5805a116c9d0bef893127427df0741b41 (diff) | |
Merge downstream code
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; } |