diff options
| author | Jacek Antonelli | 2009-09-25 22:15:49 -0500 |
|---|---|---|
| committer | Jacek Antonelli | 2009-09-25 22:15:49 -0500 |
| commit | 5ff1687542240fe9b00d4c217b764770fc369c06 (patch) | |
| tree | bc5a1dbc882c19120ca00efb9914d70059cd79cb /linden/indra/newview/llinventoryview.cpp | |
| parent | Merge remote branch 'mccabe/1.2.0-next' into next (diff) | |
| parent | Removed grid stuff from World Map (for now). (diff) | |
| download | meta-impy-5ff1687542240fe9b00d4c217b764770fc369c06.zip meta-impy-5ff1687542240fe9b00d4c217b764770fc369c06.tar.gz meta-impy-5ff1687542240fe9b00d4c217b764770fc369c06.tar.bz2 meta-impy-5ff1687542240fe9b00d4c217b764770fc369c06.tar.xz | |
Merge branch 'gridmanager' into next
Diffstat (limited to 'linden/indra/newview/llinventoryview.cpp')
| -rw-r--r-- | linden/indra/newview/llinventoryview.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/linden/indra/newview/llinventoryview.cpp b/linden/indra/newview/llinventoryview.cpp index a8d5045..008d79d 100644 --- a/linden/indra/newview/llinventoryview.cpp +++ b/linden/indra/newview/llinventoryview.cpp | |||
| @@ -967,6 +967,7 @@ void LLInventoryView::cleanup() | |||
| 967 | { | 967 | { |
| 968 | sActiveViews.get(i)->destroy(); | 968 | sActiveViews.get(i)->destroy(); |
| 969 | } | 969 | } |
| 970 | gInventory.empty(); | ||
| 970 | } | 971 | } |
| 971 | 972 | ||
| 972 | void LLInventoryView::toggleFindOptions() | 973 | void LLInventoryView::toggleFindOptions() |