More sl-20635 - moved new attachment data to AvatarAppearance message

secondlife · Dec 8, 2023 · 3777dbb · 3777dbb
1 parent ce75d0e
commit 3777dbb
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 3 deletions.
diff --git a/indra/llmessage/message.cpp b/indra/llmessage/message.cpp
@@ -307,12 +307,15 @@ void LLMessageSystem::loadTemplateFile(const std::string& filename, bool failure
 	LLTemplateTokenizer tokens(template_body);
 	LLTemplateParser parsed(tokens);
 	mMessageFileVersionNumber = parsed.getVersion();
+    S32 count                 = 0;
 	for(LLTemplateParser::message_iterator iter = parsed.getMessagesBegin();
 		iter != parsed.getMessagesEnd();
 		iter++)
 	{
 		addTemplate(*iter);
+        count++;
 	}
+    LL_INFOS("Messaging") << "Read " << count << " messages from " << filename << LL_ENDL;
 }
 
 

diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
@@ -9266,7 +9266,7 @@ void LLVOAvatar::parseAppearanceMessage(LLMessageSystem* mesgsys, LLAppearanceMe
 		//mesgsys->getU32Fast(_PREHASH_AppearanceData, _PREHASH_Flags, appearance_flags, 0);
 	}
 
-	// Parse the AppearanceData field, if any.
+	// Parse the AppearanceHover field, if any.
 	contents.mHoverOffsetWasSet = false;
 	if (mesgsys->has(_PREHASH_AppearanceHover))
 	{
@@ -9276,7 +9276,24 @@ void LLVOAvatar::parseAppearanceMessage(LLMessageSystem* mesgsys, LLAppearanceMe
 		contents.mHoverOffset = hover;
 		contents.mHoverOffsetWasSet = true;
 	}
-
+
+    // Get attachment info, if sent
+    LLUUID attachment_id;
+    U8     attach_point;
+    S32    attach_count = mesgsys->getNumberOfBlocksFast(_PREHASH_AttachmentBlock);
+    LL_DEBUGS("AVAppearanceAttachments") << "Agent " << getID() << " has "
+                                         << attach_count << " attachments" << LL_ENDL;
+
+    for (S32 attach_i = 0; attach_i < attach_count; attach_i++)
+    {
+        mesgsys->getUUIDFast(_PREHASH_AttachmentBlock, _PREHASH_ID, attachment_id, attach_i);
+        mesgsys->getU8Fast(_PREHASH_AttachmentBlock, _PREHASH_AttachmentPoint, attach_point, attach_i);
+        LL_DEBUGS("AVAppearanceAttachments") << "AV " << getID() << " has attachment " << attach_i << " "
+            << (attachment_id.isNull() ? "pending" : attachment_id.asString())
+            << " on point " << (S32)attach_point << LL_ENDL;
+        // To do - store and use this information as needed
+	}
+
 	// Parse visual params, if any.
 	S32 num_blocks = mesgsys->getNumberOfBlocksFast(_PREHASH_VisualParam);
     static LLCachedControl<bool> block_some_avatars(gSavedSettings, "BlockSomeAvatarAppearanceVisualParams");

diff --git a/scripts/messages/message_template.msg b/scripts/messages/message_template.msg
@@ -3607,6 +3607,11 @@ version 2.0
 		AppearanceHover		Variable
 		{	HoverHeight	LLVector3	}
 	}
+	{
+		AttachmentBlock		Variable
+		{	ID				    LLUUID  }
+		{	AttachmentPoint 		U8  }
+	}
 }
 
 // AvatarSitResponse - response to a request to sit on an object

diff --git a/scripts/messages/message_template.msg.sha1 b/scripts/messages/message_template.msg.sha1
@@ -1 +1 @@
-e3bd0529a647d938ab6d48f26d21dd52c07ebc6e
+d7915d67467e59287857630bd89bf9529d065199