diff options
| author | Loren Shih <seraph@lindenlab.com> | 2009-12-21 18:31:19 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2009-12-21 18:31:19 -0500 |
| commit | 04b63a67e60afafeb472b76bcfb7976f4f01e191 (patch) | |
| tree | b5a2180f4df58e29d985321a8d4e6a23efb7f609 /indra | |
| parent | 65dfc746888f44309efaacf439057ba30e713e06 (diff) | |
EXT-3619 : CRASH in xui preview tool when editing an inventory panel
Now checking if inventory is usable before checking if views are initialized.
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llinventorypanel.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llinventorypanel.cpp b/indra/newview/llinventorypanel.cpp index 0bdad791a7..082b7a9468 100644 --- a/indra/newview/llinventorypanel.cpp +++ b/indra/newview/llinventorypanel.cpp @@ -402,9 +402,12 @@ void LLInventoryPanel::modelChanged(U32 mask) // static void LLInventoryPanel::onIdle(void *userdata) { + if (!gInventory.isInventoryUsable()) + return; + LLInventoryPanel *self = (LLInventoryPanel*)userdata; // Inventory just initialized, do complete build - if (!self->mViewsInitialized && gInventory.isInventoryUsable()) + if (!self->mViewsInitialized) { self->initializeViews(); } |