Second Life viewer sources 1.18.3.2-RC

1 files changed, 5 insertions, 1 deletions

diff --git a/linden/indra/newview/llviewerinventory.h b/linden/indra/newview/llviewerinventory.h
index 513834f..1226a83 100644
--- a/linden/indra/newview/llviewerinventory.h
+++ b/linden/indra/newview/llviewerinventory.h
@@ -234,6 +234,9 @@ public:
 private:
         std::map<U32, LLPointer<LLInventoryCallback> > mMap;
         U32 mLastCallback;
+        static LLInventoryCallbackManager *sInstance;
+public:
+        static bool is_instantiated() { return sInstance != NULL; }
 };
 extern LLInventoryCallbackManager gInventoryCallbacks;
 
@@ -269,7 +272,8 @@ void move_inventory_item(
 
 void copy_inventory_from_notecard(const LLUUID& object_id,
                                                                   const LLUUID& notecard_inv_id,
-                                                                  const LLInventoryItem *src);
+                                                                  const LLInventoryItem *src,
+                                                                  U32 callback_id = 0);
 
 
 #endif // LL_LLVIEWERINVENTORY_H