livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SL-18668 Only object id is strictly required

meow-7.2.2
Andrey Kleshchev 2022-11-18 19:59:50 +02:00
parent 3368fe153e
commit 32663643c7
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
indra/newview/llgltfmateriallist.cpp
View File

@ -175,12 +175,10 @@ public:
return false;
}
if (!message.has("sides")
|| !message.has("gltf_json")
|| !message.has("object_id"))
if (!message.has("object_id"))
{
// malformed message, nothing we can do to handle it
LL_DEBUGS("GLTF") << "Malformed message:" << message << LL_ENDL;
LL_DEBUGS("GLTF") << "Message without id:" << message << LL_ENDL;
return false;
}
@ -247,12 +245,13 @@ public:
{
LLUUID object_id = message.get("object_id").asUUID();
LLSD const& sides = message.get("sides");
LLViewerObject * obj = gObjectList.findObject(object_id);
std::unordered_set<S32> side_set;
if (result.mResults.size() > 0 )
{
LLSD const& sides = message.get("sides");
std::unordered_set<S32> side_set;
for (int i = 0; i < result.mResults.size(); ++i)
{
if (result.mResults[i])