svn merge -r113004:115000 svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.26

Merge latest 1.26 into trunk

1 files changed, 23 insertions, 1 deletions

diff --git a/scripts/messages/message_template.msg b/scripts/messages/message_template.msg
index c6d42cf882..22752ef33c 100644
--- a/scripts/messages/message_template.msg
+++ b/scripts/messages/message_template.msg
@@ -723,6 +723,10 @@ version 2.0
 		{	Auction			BOOL		}
 		{	Dwell			F32			}
 	}
+	{
+		StatusData            Variable
+		{	Status		U32		}
+	}
 }
 
 // DirPeopleReply
@@ -767,6 +771,10 @@ version 2.0
 		{	UnixTime	U32				}
 		{	EventFlags	U32				}
 	}
+	{
+		StatusData Variable
+		{	Status		U32			}
+	}
 }
 
 // DirGroupsReply
@@ -852,6 +860,10 @@ version 2.0
 		{	ExpirationDate	U32			}
 		{	PriceForListing	S32			}
 	}
+	{
+		StatusData Variable
+		{	Status			U32		}
+	}
 }
 
 
@@ -1465,7 +1477,7 @@ version 2.0
 	}
 }
 
-// TeleportFailed somehwere->sim->viewer
+// TeleportFailed somewhere->sim->viewer
 // announce failure of teleport request
 {
 	TeleportFailed Low 74 Trusted Unencoded
@@ -1474,6 +1486,11 @@ version 2.0
 		{	AgentID		LLUUID			}
 		{	Reason		Variable	1	}  // string
 	}
+	{
+		AlertInfo			Variable
+		{	Message			Variable	1	}	// string id
+		{	ExtraParams		Variable	1	}	// llsd extra parameters
+	}
 }
 
 
@@ -2810,6 +2827,11 @@ version 2.0
 		AlertData			Single
 		{	Message			Variable	1	}
 	}
+	{
+		AlertInfo			Variable
+		{	Message			Variable	1	}
+		{	ExtraParams		Variable	1	}
+	}
 }
 
 // Send an AlertMessage to the named agent.