diff options
| author | Aimee Linden <aimee@lindenlab.com> | 2010-06-21 13:45:12 +0100 |
|---|---|---|
| committer | Aimee Linden <aimee@lindenlab.com> | 2010-06-21 13:45:12 +0100 |
| commit | a069e0d3db0e0771e54768a702fa18e57415992e (patch) | |
| tree | 0216de28c44dd31278fcd47c09b8cc54c2891c7b /indra/newview/llinventoryobserver.cpp | |
| parent | c0129e4b11455a05a94300e1649cf3edaaf824aa (diff) | |
| parent | b12c98e48ce44df907c7477e1c21061778459496 (diff) | |
Merge
Diffstat (limited to 'indra/newview/llinventoryobserver.cpp')
| -rw-r--r-- | indra/newview/llinventoryobserver.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/indra/newview/llinventoryobserver.cpp b/indra/newview/llinventoryobserver.cpp index 0ac8fbcb15..8cb263d9a7 100644 --- a/indra/newview/llinventoryobserver.cpp +++ b/indra/newview/llinventoryobserver.cpp @@ -523,8 +523,14 @@ void LLInventoryAddItemByAssetObserver::changed(U32 mask) return; } - LLPointer<LLViewerInventoryItem> item = new LLViewerInventoryItem; LLMessageSystem* msg = gMessageSystem; + if (!(msg->getMessageName() && (0 == strcmp(msg->getMessageName(), "UpdateCreateInventoryItem")))) + { + // this is not our message + return; // to prevent a crash. EXT-7921; + } + + LLPointer<LLViewerInventoryItem> item = new LLViewerInventoryItem; S32 num_blocks = msg->getNumberOfBlocksFast(_PREHASH_InventoryData); for(S32 i = 0; i < num_blocks; ++i) { |