diff options
| author | simon <none@none> | 2013-04-29 15:12:54 -0700 |
|---|---|---|
| committer | simon <none@none> | 2013-04-29 15:12:54 -0700 |
| commit | 35f7a750836b72cb116e60b315ca32664911001b (patch) | |
| tree | b6e896a293f6103529989575880d287f9f5f74b2 /indra/newview/llviewerobject.h | |
| parent | 3e5fb382dd5fd896bd96320e9469286e582220c4 (diff) | |
| parent | 5af5b49a6205c34b8787cd4ecb4bd1d94174663f (diff) | |
Merge in downstream code from viewer-beta
Diffstat (limited to 'indra/newview/llviewerobject.h')
| -rw-r--r-- | indra/newview/llviewerobject.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewerobject.h b/indra/newview/llviewerobject.h index 728d279c39..316dbce7d0 100644 --- a/indra/newview/llviewerobject.h +++ b/indra/newview/llviewerobject.h @@ -656,7 +656,7 @@ protected: // static void processTaskInvFile(void** user_data, S32 error_code, LLExtStat ext_status); - void loadTaskInvFile(const std::string& filename); + BOOL loadTaskInvFile(const std::string& filename); void doInventoryCallback(); BOOL isOnMap(); |