Merge sl-search-opt-in back into the release branch

Reviewed by Josh and Don

1 files changed, 24 insertions, 1 deletions

diff --git a/scripts/messages/message_template.msg b/scripts/messages/message_template.msg
index 4572941248..983be8a11d 100644
--- a/scripts/messages/message_template.msg
+++ b/scripts/messages/message_template.msg
@@ -3783,6 +3783,10 @@ version 2.0
 		{	GroupName			Variable 1	}
 		{	GroupInsigniaID		LLUUID		}
 	}
+	{
+		NewGroupData		Single
+		{	ListInProfile	BOOL		}	// whether group displays in profile
+	}
 }
 
 
@@ -7823,6 +7827,10 @@ version 2.0
 		{	GroupID		LLUUID	}
 		{	AcceptNotices	BOOL	}
 	}
+	{
+		NewData				Single
+		{	ListInProfile	BOOL	}
+	}
 }
 
 // GroupRoleDataRequest
@@ -8140,7 +8148,7 @@ version 2.0
 // dataserver -> simulator -> viewer
 // reliable
 {
-	AgentGroupDataUpdate Low 389 Trusted Zerocoded
+	AgentGroupDataUpdate Low 389 Trusted Zerocoded UDPDeprecated
 	{
 		AgentData			Single
 		{	AgentID				LLUUID	}
@@ -8763,3 +8771,18 @@ version 2.0
 	}
 }
 
+// ObjectIncludeInSearch
+// viewer -> simulator
+{
+	ObjectIncludeInSearch Low 424 NotTrusted Unencoded
+	{
+		AgentData		Single
+		{	AgentID		LLUUID	}
+		{	SessionID	LLUUID	}
+	}
+	{
+		ObjectData		Variable
+		{	ObjectLocalID	U32		}
+		{	IncludeInSearch	BOOL	}
+	}
+}