diff options
| author | Nyx Linden <nyx@lindenlab.com> | 2013-05-02 14:48:47 -0400 |
|---|---|---|
| committer | Nyx Linden <nyx@lindenlab.com> | 2013-05-02 14:48:47 -0400 |
| commit | e5d23969b9ad75ca535182ccbe76ff2b80d00605 (patch) | |
| tree | 3f7c27476a95da3a8a7eeffc228541a86a1eaaac /indra/newview/llviewerobject.h | |
| parent | af1431731802320e241037486b8bff0003a4d827 (diff) | |
| parent | 2f1f7c86bd7f366be5d5ccf64cf1af1300bc57a0 (diff) | |
merge
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(); |