diff options
| author | simon <none@none> | 2013-04-30 10:02:05 -0700 |
|---|---|---|
| committer | simon <none@none> | 2013-04-30 10:02:05 -0700 |
| commit | cf37c677643b5b147e060e138dd9307ee36af677 (patch) | |
| tree | 189aa5e3eb37ba73b42ce76d0d825365c6dc62e0 /indra/newview/llviewerobject.h | |
| parent | 39638b0de3734fea2d112161a3289b67f7594ba3 (diff) | |
| parent | 35f7a750836b72cb116e60b315ca32664911001b (diff) | |
Merge downstream code from viewer-bear
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 40e09a4f41..9996c916a4 100644 --- a/indra/newview/llviewerobject.h +++ b/indra/newview/llviewerobject.h @@ -651,7 +651,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(); |