diff options
| author | Ansariel <none@none> | 2016-11-14 14:45:53 +0100 |
|---|---|---|
| committer | Ansariel <none@none> | 2016-11-14 14:45:53 +0100 |
| commit | 420b1c9429d36d75ee3c5de85b37f47bc207a122 (patch) | |
| tree | 2f4670646bb6ce1b59b2dc124960d7490a990ed0 /indra/newview/llappviewer.cpp | |
| parent | 086c1342152895da28d2e0130d09432152604ca8 (diff) | |
STORM-2141: Fix various inventory floater related issues:
* Opening new inventory via Control-Shift-I shortcut uses legacy and potentinally dangerous code path
* Closing new inventory windows don't release memory
* During shutdown legacy and inoperable code for inventory window cleanup is called
* Remove old and unused inventory legacy code
Diffstat (limited to 'indra/newview/llappviewer.cpp')
| -rw-r--r-- | indra/newview/llappviewer.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 76d0d46997..f043155753 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -208,7 +208,7 @@ #include "llfloaterreg.h" #include "llfloateroutfitsnapshot.h" #include "llfloatersnapshot.h" -#include "llfloaterinventory.h" +#include "llsidepanelinventory.h" // includes for idle() idleShutdown() #include "llviewercontrol.h" @@ -5488,7 +5488,7 @@ void LLAppViewer::disconnectViewer() expCache->cleanup(); // close inventory interface, close all windows - LLFloaterInventory::cleanup(); + LLSidepanelInventory::cleanup(); gAgentWearables.cleanup(); gAgentCamera.cleanup(); |