diff options
author | Nyx Linden <nyx@lindenlab.com> | 2013-06-18 16:15:03 -0400 |
---|---|---|
committer | Nyx Linden <nyx@lindenlab.com> | 2013-06-18 16:15:03 -0400 |
commit | 69b062b90889fe581de0d10d60b979cb7883b4a0 (patch) | |
tree | 6286fc967bc0f551a9e67b8377bdfbc743f090b2 /indra/newview/llpanelplaces.cpp | |
parent | c67db8e75511de879c69de0faf06a88ac3cc731d (diff) | |
parent | 425ff28e4bc38ba3f7bfeade4a72dce4eba63b54 (diff) |
merge with viewer-release
Diffstat (limited to 'indra/newview/llpanelplaces.cpp')
-rwxr-xr-x | indra/newview/llpanelplaces.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llpanelplaces.cpp b/indra/newview/llpanelplaces.cpp index 6c2a01fc82..730df2ea23 100755 --- a/indra/newview/llpanelplaces.cpp +++ b/indra/newview/llpanelplaces.cpp @@ -217,7 +217,7 @@ public: LLRemoteParcelInfoProcessor::getInstance()->sendParcelInfoRequest(parcel_id); } } - /*virtual*/ void setErrorStatus(U32 status, const std::string& reason) + /*virtual*/ void setErrorStatus(S32 status, const std::string& reason) { llerrs << "Can't complete remote parcel request. Http Status: " << status << ". Reason : " << reason << llendl; |