diff options
| author | Richard Linden <none@none> | 2012-07-25 14:30:17 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2012-07-25 14:30:17 -0700 |
| commit | c4f59fd5882d8b019830292e9e5ed1d2480f73ef (patch) | |
| tree | 96e4c2196676355f192d8e9296a5df1c3bafa8b8 /indra/newview/llpanelobjectinventory.cpp | |
| parent | decd8a435d8fb15bab52eec9e447b176e33eb5cf (diff) | |
CHUI-239 FIX Viewer crash when opening object with contents
Diffstat (limited to 'indra/newview/llpanelobjectinventory.cpp')
| -rw-r--r-- | indra/newview/llpanelobjectinventory.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/indra/newview/llpanelobjectinventory.cpp b/indra/newview/llpanelobjectinventory.cpp index 937d3bb8c5..9bd716e900 100644 --- a/indra/newview/llpanelobjectinventory.cpp +++ b/indra/newview/llpanelobjectinventory.cpp @@ -155,7 +155,8 @@ LLTaskInvFVBridge::LLTaskInvFVBridge( LLPanelObjectInventory* panel, const LLUUID& uuid, const std::string& name, - U32 flags): + U32 flags) +: LLFolderViewModelItemInventory(panel->getRootViewModel()), mUUID(uuid), mName(name), mPanel(panel), @@ -1915,7 +1916,10 @@ void LLPanelObjectInventory::idle(void* user_data) { LLPanelObjectInventory* self = (LLPanelObjectInventory*)user_data; - + if (self->mFolders) + { + self->mFolders->update(); + } if (self->mInventoryNeedsUpdate) { self->updateInventory(); |