diff options
| author | dolphin <dolphin@lindenlab.com> | 2013-04-18 15:59:22 -0700 |
|---|---|---|
| committer | dolphin <dolphin@lindenlab.com> | 2013-04-18 15:59:22 -0700 |
| commit | eec08ef64c59fa7569c7418d40135d73338e1d8d (patch) | |
| tree | 3b62188c704df9ea16484c497d68388ab2908b80 /indra/newview/llviewerobject.h | |
| parent | 56badfe3498b5eeefb5c06c4b0d51eb1c62ded9c (diff) | |
| parent | ed2b5da8f1eb51e747f6d9f5a4fc535cbf7e69d9 (diff) | |
Merge with viewer-development
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(); |