diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-11-19 17:59:55 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-11-19 17:59:55 -0500 |
| commit | 0031e9a97be1bf6e9fe773c23506494d09ce91ae (patch) | |
| tree | 220f195c82174b7cc8e94dceb2553e59fe5837a5 /indra/newview/llremoteparcelrequest.h | |
| parent | b7edc965bc77ab21e9a1e3f6b424299a50053529 (diff) | |
| parent | ebc9bcbf69f7a519677a6522979a6bf6cbb04bb8 (diff) | |
merge up to 3.6.10-release; some of the storm-68 changes lost
Diffstat (limited to 'indra/newview/llremoteparcelrequest.h')
| -rwxr-xr-x[-rw-r--r--] | indra/newview/llremoteparcelrequest.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llremoteparcelrequest.h b/indra/newview/llremoteparcelrequest.h index 74cf1616df..b87056573b 100644..100755 --- a/indra/newview/llremoteparcelrequest.h +++ b/indra/newview/llremoteparcelrequest.h @@ -44,7 +44,7 @@ public: /*virtual*/ void result(const LLSD& content); //If we get back an error (not found, etc...), handle it here - /*virtual*/ void error(U32 status, const std::string& reason); + /*virtual*/ void errorWithContent(U32 status, const std::string& reason, const LLSD& content); protected: LLHandle<LLRemoteParcelInfoObserver> mObserverHandle; |