diff options
| author | Ansariel Hiller <Ansariel@users.noreply.github.com> | 2024-08-19 23:47:42 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-08-20 00:47:42 +0300 |
| commit | 862a4671f2a48eae4a2360d570b71f4adbb7328c (patch) | |
| tree | f21a5152c5bb94f96b2802b389f65eab795e390a /indra/newview | |
| parent | 600635f9005d1809c278918e3284e1b43f1be475 (diff) | |
Remove orphaned LLAllocator (#2348)
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llappviewer.cpp | 3 | ||||
| -rw-r--r-- | indra/newview/llappviewer.h | 5 | ||||
| -rw-r--r-- | indra/newview/llviewerprecompiledheaders.h | 1 |
3 files changed, 0 insertions, 9 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index b75d02a8a7..afa701c5f2 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -62,7 +62,6 @@ #include "llfocusmgr.h" #include "llurlfloaterdispatchhandler.h" #include "llviewerjoystick.h" -#include "llallocator.h" #include "llcalc.h" #include "llconversationlog.h" #if LL_WINDOWS @@ -769,8 +768,6 @@ bool LLAppViewer::init() LLError::setFatalFunction([rc](const std::string&){ _exit(rc); }); } - mAlloc.setProfilingEnabled(gSavedSettings.getBOOL("MemProfiling")); - // Initialize the non-LLCurl libcurl library. Should be called // before consumers (LLTextureFetch). mAppCoreHttp.init(); diff --git a/indra/newview/llappviewer.h b/indra/newview/llappviewer.h index cf5f1ab1e3..9a5dd6dca3 100644 --- a/indra/newview/llappviewer.h +++ b/indra/newview/llappviewer.h @@ -44,7 +44,6 @@ #define LL_LLAPPVIEWER_H #include "llapp.h" -#include "llallocator.h" #include "llapr.h" #include "llcontrol.h" #include "llsys.h" // for LLOSInfo @@ -194,8 +193,6 @@ public: // *NOTE:Mani Fix this for login abstraction!! void handleLoginComplete(); - LLAllocator & getAllocator() { return mAlloc; } - // On LoginCompleted callback typedef boost::signals2::signal<void (void)> login_completed_signal_t; login_completed_signal_t mOnLoginCompleted; @@ -338,8 +335,6 @@ private: bool mAgentRegionLastAlive; LLUUID mAgentRegionLastID; - LLAllocator mAlloc; - // llcorehttp library init/shutdown helper LLAppCoreHttp mAppCoreHttp; diff --git a/indra/newview/llviewerprecompiledheaders.h b/indra/newview/llviewerprecompiledheaders.h index 6561f0d644..7c8067ede3 100644 --- a/indra/newview/llviewerprecompiledheaders.h +++ b/indra/newview/llviewerprecompiledheaders.h @@ -50,7 +50,6 @@ // Library headers from llcommon project: #include "indra_constants.h" #include "llinitparam.h" -#include "llallocator.h" #include "llapp.h" #include "llcriticaldamp.h" #include "lldefs.h" |