diff options
| author | simon <none@none> | 2013-04-11 16:18:34 -0700 |
|---|---|---|
| committer | simon <none@none> | 2013-04-11 16:18:34 -0700 |
| commit | b42b7897233df17eb0f37af2ada9070dbb075eeb (patch) | |
| tree | 5d83e305bf3afac18dec414335fe248be3aaedef /indra/newview/llremoteparcelrequest.h | |
| parent | c262cb15d38cdf344b6e1ca755e611b02d3db79d (diff) | |
| parent | c7bab8ab8b25249d1f8f87746b50fce4820f542a (diff) | |
Merge in downstream code (chui fixes, materials)
Diffstat (limited to 'indra/newview/llremoteparcelrequest.h')
| -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 --- 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; |