diff options
| author | Richard Linden <none@none> | 2011-06-23 10:57:41 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2011-06-23 10:57:41 -0700 |
| commit | 715cb3cc0ca968002af247d0ba67a5d3bed76756 (patch) | |
| tree | e6b72e312c2e5dcada08d7bf9294c8e18d4b6e45 /indra/newview/llviewermessage.cpp | |
| parent | c61a7fbaace20415be3003eaab95ce359ff8621a (diff) | |
| parent | 1e87fc43d7c07be618678aab6ee9f5511e593e92 (diff) | |
Automated merge with ssh://hg.lindenlab.com/leyla/viewer-experience-dd
Diffstat (limited to 'indra/newview/llviewermessage.cpp')
| -rw-r--r-- | indra/newview/llviewermessage.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index 3832be727f..766df29a81 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -937,7 +937,6 @@ protected: //one global instance to bind them LLOpenTaskOffer* gNewInventoryObserver=NULL; - class LLNewInventoryHintObserver : public LLInventoryAddedObserver { protected: @@ -947,6 +946,8 @@ protected: } }; +LLNewInventoryHintObserver* gNewInventoryHintObserver=NULL; + void start_new_inventory_observer() { if (!gNewInventoryObserver) //task offer observer @@ -963,7 +964,12 @@ void start_new_inventory_observer() gInventory.addObserver(gInventoryMoveObserver); } - gInventory.addObserver(new LLNewInventoryHintObserver()); + if (!gNewInventoryHintObserver) + { + // Observer is deleted by gInventory + gNewInventoryHintObserver = new LLNewInventoryHintObserver(); + gInventory.addObserver(gNewInventoryHintObserver); + } } class LLDiscardAgentOffer : public LLInventoryFetchItemsObserver |