diff options
| author | simon <none@none> | 2013-04-11 16:23:36 -0700 |
|---|---|---|
| committer | simon <none@none> | 2013-04-11 16:23:36 -0700 |
| commit | 066f2acadf6f1624fcdfc22263a890c370473887 (patch) | |
| tree | a4e52b29d8074cdc8782ff28b9b0500b32dada50 /indra/newview/lluploadfloaterobservers.h | |
| parent | 98a82c50d539451e1931826ca75fbc01d611806d (diff) | |
| parent | 460c81070e5fa1c51ce7e186a9ecb8c5f1c995e1 (diff) | |
Forgot to commit @#! merge
Diffstat (limited to 'indra/newview/lluploadfloaterobservers.h')
| -rw-r--r-- | indra/newview/lluploadfloaterobservers.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/lluploadfloaterobservers.h b/indra/newview/lluploadfloaterobservers.h index 79aad282d7..b43ddb44d9 100644 --- a/indra/newview/lluploadfloaterobservers.h +++ b/indra/newview/lluploadfloaterobservers.h @@ -86,7 +86,7 @@ public: LLUploadModelPremissionsResponder(const LLHandle<LLUploadPermissionsObserver>& observer); - void error(U32 status, const std::string& reason); + void errorWithContent(U32 status, const std::string& reason, const LLSD& content); void result(const LLSD& content); |