diff options
| author | Oz Linden <oz@lindenlab.com> | 2014-06-16 11:42:37 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2014-06-16 11:42:37 -0400 |
| commit | e15002a11cf5081e0697065cb017ba0af6c4b32d (patch) | |
| tree | d60ac6d3a85d114b7860e42be5d9ff3338a6a169 /indra/newview/llpanellandmarks.h | |
| parent | 78be5c3aa5f7263698bec5bcbccb24c150f78d09 (diff) | |
| parent | 977476171ddcc057d7c28b6c14ae988b8189ed75 (diff) | |
merge changes for 3.7.9-release
Diffstat (limited to 'indra/newview/llpanellandmarks.h')
| -rwxr-xr-x | indra/newview/llpanellandmarks.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llpanellandmarks.h b/indra/newview/llpanellandmarks.h index 80310d1524..c11cbe05ae 100755 --- a/indra/newview/llpanellandmarks.h +++ b/indra/newview/llpanellandmarks.h @@ -108,7 +108,7 @@ protected: //LLRemoteParcelInfoObserver interface /*virtual*/ void processParcelInfo(const LLParcelData& parcel_data); /*virtual*/ void setParcelID(const LLUUID& parcel_id); - /*virtual*/ void setErrorStatus(U32 status, const std::string& reason); + /*virtual*/ void setErrorStatus(S32 status, const std::string& reason); private: void initFavoritesInventoryPanel(); |