diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2010-06-21 12:20:24 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2010-06-21 12:20:24 -0400 |
| commit | f17623d8c67a10c2d7547e40ac8442c703d107ed (patch) | |
| tree | 2ae37385da280a758a66e920f9bdb317dcde59ee /indra/newview/llinventoryobserver.cpp | |
| parent | 4e538adca41d486125c3b887ce694c457bcab157 (diff) | |
| parent | bef22c0325cbfeb3d290753a66ecf862bf4593d3 (diff) | |
Automated merge with ssh://192.168.2.107/c:/linden/viewer-release/
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) { |