diff options
| author | Christian Goetze <cg@lindenlab.com> | 2007-08-21 22:17:53 +0000 |
|---|---|---|
| committer | Christian Goetze <cg@lindenlab.com> | 2007-08-21 22:17:53 +0000 |
| commit | ce0a5fe14590b8d675b885fccd5f79d7ea17a302 (patch) | |
| tree | 3388e6f8ff02292ec4521d278c841801462945b8 /indra/newview/llviewermessage.h | |
| parent | b699ae454d8477d19342d320758cd993d1d28cec (diff) | |
EFFECTIVE MERGE: svn merge -r 66133:68118 svn+ssh://svn/svn/linden/branches/maintenance into release
Actual action: branched maintenance-r68118, merged in release, then copied result into release
Diffstat (limited to 'indra/newview/llviewermessage.h')
| -rw-r--r-- | indra/newview/llviewermessage.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llviewermessage.h b/indra/newview/llviewermessage.h index ccfd1f7277..93519f7736 100644 --- a/indra/newview/llviewermessage.h +++ b/indra/newview/llviewermessage.h @@ -160,7 +160,7 @@ void process_covenant_reply(LLMessageSystem* msg, void**); void onCovenantLoadComplete(LLVFS *vfs, const LLUUID& asset_uuid, LLAssetType::EType type, - void* user_data, S32 status); + void* user_data, S32 status, LLExtStat ext_status); void callbackCacheEstateOwnerName( const LLUUID& id, const char* first, @@ -199,3 +199,4 @@ void process_feature_disabled_message(LLMessageSystem* msg, void**); #endif + |