Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[EEP] Change to using LLTranslationBridge::ptr_t

Browse Source
This commit is contained in:
Lirusaito
2019-03-24 22:46:32 -04:00
parent 28c814e4ef
commit 28de2ceed8
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
indra/llappearance/llwearabletype.cpp
View File

@@ -29,17 +29,17 @@
#include "llinventorytype.h" #include "llinventorytype.h"
#include "llinventorydefines.h" #include "llinventorydefines.h"
static LLTranslationBridge* sTrans = NULL; static LLTranslationBridge::ptr_t sTrans = NULL;
// static // static
void LLWearableType::initClass(LLTranslationBridge* trans) void LLWearableType::initClass(LLTranslationBridge::ptr_t &trans)
{ {
sTrans = trans; sTrans = trans;
} }
void LLWearableType::cleanupClass() void LLWearableType::cleanupClass()
{ {
delete sTrans; sTrans.reset();
} }
struct WearableEntry : public LLDictionaryEntry struct WearableEntry : public LLDictionaryEntry

2
indra/llappearance/llwearabletype.h
View File

@@ -63,7 +63,7 @@ public:
WT_NONE = -1, WT_NONE = -1,
}; };
static void initClass(LLTranslationBridge* trans); // initializes static members static void initClass(LLTranslationBridge::ptr_t &trans); // initializes static members
static void cleanupClass(); // initializes static members static void cleanupClass(); // initializes static members
static const std::string& getTypeName(EType type); static const std::string& getTypeName(EType type);

3
indra/newview/llappviewer.cpp
View File

@@ -640,7 +640,8 @@ bool LLAppViewer::init()
// initialize LLWearableType translation bridge. // initialize LLWearableType translation bridge.
// Memory will be cleaned up in ::cleanupClass() // Memory will be cleaned up in ::cleanupClass()
LLWearableType::initClass(new LLUITranslationBridge()); LLTranslationBridge::ptr_t trans = std::make_shared<LLUITranslationBridge>();
LLWearableType::initClass(trans);
// <edit> // <edit>
// We can call this early. // We can call this early.