Added stub handler for GLTF LargeGenericMessage as part of work on SL-18105 SL-17697 and SL-17698
parent
c6bb0fef90
commit
7a3ed9dadc
|
|
@ -28,13 +28,36 @@
|
|||
#include "llgltfmateriallist.h"
|
||||
|
||||
#include "llassetstorage.h"
|
||||
#include "lldispatcher.h"
|
||||
#include "llfilesystem.h"
|
||||
#include "llsdserialize.h"
|
||||
#include "lltinygltfhelper.h"
|
||||
#include "llviewergenericmessage.h"
|
||||
|
||||
#include "tinygltf/tiny_gltf.h"
|
||||
#include <strstream>
|
||||
|
||||
namespace
|
||||
{
|
||||
class LLGLTFOverrideDispatchHandler : public LLDispatchHandler
|
||||
{
|
||||
public:
|
||||
LLGLTFOverrideDispatchHandler() = default;
|
||||
~LLGLTFOverrideDispatchHandler() override = default;
|
||||
|
||||
bool operator()(const LLDispatcher* dispatcher, const std::string& key, const LLUUID& invoice, const sparam_t& strings) override
|
||||
{
|
||||
LL_DEBUGS() << "strings: ";
|
||||
for (std::string const & s : strings) {
|
||||
LL_CONT << " " << s;
|
||||
}
|
||||
LL_CONT << LL_ENDL;
|
||||
return true;
|
||||
}
|
||||
};
|
||||
LLGLTFOverrideDispatchHandler handle_gltf_override_message;
|
||||
}
|
||||
|
||||
LLGLTFMaterialList gGLTFMaterialList;
|
||||
|
||||
LLGLTFMaterial* LLGLTFMaterialList::getMaterial(const LLUUID& id)
|
||||
|
|
@ -128,3 +151,8 @@ void LLGLTFMaterialList::removeMaterial(const LLUUID& id)
|
|||
mList.erase(id);
|
||||
}
|
||||
|
||||
// static
|
||||
void LLGLTFMaterialList::registerCallbacks()
|
||||
{
|
||||
gGenericDispatcher.addHandler("GLTF", &handle_gltf_override_message);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -44,6 +44,8 @@ public:
|
|||
void addMaterial(const LLUUID& id, LLGLTFMaterial* material);
|
||||
void removeMaterial(const LLUUID& id);
|
||||
|
||||
static void registerCallbacks();
|
||||
|
||||
};
|
||||
|
||||
extern LLGLTFMaterialList gGLTFMaterialList;
|
||||
|
|
|
|||
|
|
@ -60,6 +60,7 @@
|
|||
#include "llfloatergridstatus.h"
|
||||
#include "llfloaterimsession.h"
|
||||
#include "lllocationhistory.h"
|
||||
#include "llgltfmateriallist.h"
|
||||
#include "llimageworker.h"
|
||||
|
||||
#include "llloginflags.h"
|
||||
|
|
@ -1473,6 +1474,9 @@ bool idle_startup()
|
|||
gXferManager->registerCallbacks(gMessageSystem);
|
||||
display_startup();
|
||||
|
||||
LLGLTFMaterialList::registerCallbacks();
|
||||
display_startup();
|
||||
|
||||
LLStartUp::initNameCache();
|
||||
display_startup();
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue