diff options
Diffstat (limited to '')
-rw-r--r-- | linden/indra/newview/llviewerobject.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/linden/indra/newview/llviewerobject.h b/linden/indra/newview/llviewerobject.h index 4e2cee0..36c6a21 100644 --- a/linden/indra/newview/llviewerobject.h +++ b/linden/indra/newview/llviewerobject.h | |||
@@ -12,12 +12,12 @@ | |||
12 | * ("GPL"), unless you have obtained a separate licensing agreement | 12 | * ("GPL"), unless you have obtained a separate licensing agreement |
13 | * ("Other License"), formally executed by you and Linden Lab. Terms of | 13 | * ("Other License"), formally executed by you and Linden Lab. Terms of |
14 | * the GPL can be found in doc/GPL-license.txt in this distribution, or | 14 | * the GPL can be found in doc/GPL-license.txt in this distribution, or |
15 | * online at http://secondlife.com/developers/opensource/gplv2 | 15 | * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2 |
16 | * | 16 | * |
17 | * There are special exceptions to the terms and conditions of the GPL as | 17 | * There are special exceptions to the terms and conditions of the GPL as |
18 | * it is applied to this Source Code. View the full text of the exception | 18 | * it is applied to this Source Code. View the full text of the exception |
19 | * in the file doc/FLOSS-exception.txt in this software distribution, or | 19 | * in the file doc/FLOSS-exception.txt in this software distribution, or |
20 | * online at http://secondlife.com/developers/opensource/flossexception | 20 | * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception |
21 | * | 21 | * |
22 | * By copying, modifying or distributing this software, you acknowledge | 22 | * By copying, modifying or distributing this software, you acknowledge |
23 | * that you have read and understood your obligations described above, | 23 | * that you have read and understood your obligations described above, |
@@ -373,6 +373,7 @@ public: | |||
373 | BOOL isInventoryPending() { return mInventoryPending; } | 373 | BOOL isInventoryPending() { return mInventoryPending; } |
374 | void clearInventoryListeners(); | 374 | void clearInventoryListeners(); |
375 | void requestInventory(); | 375 | void requestInventory(); |
376 | void fetchInventoryFromServer(); | ||
376 | static void processTaskInv(LLMessageSystem* msg, void** user_data); | 377 | static void processTaskInv(LLMessageSystem* msg, void** user_data); |
377 | void removeInventory(const LLUUID& item_id); | 378 | void removeInventory(const LLUUID& item_id); |
378 | 379 | ||