Merging from server/server-1.25 back to trunk.

  svn merge -r99446:104838 svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.25

Conflicts resolved by Prospero, except for one scary conflict in
SendConfirmationEmail.php which was resolved by jarv.

1 files changed, 52 insertions, 0 deletions

diff --git a/scripts/messages/message_template.msg b/scripts/messages/message_template.msg
index a7835adbfe..6d9062228e 100644
--- a/scripts/messages/message_template.msg
+++ b/scripts/messages/message_template.msg
@@ -2942,6 +2942,14 @@ version 2.0
 		{	UseEstateSun		BOOL		}
 		{	SunHour				F32			}	// last value set by estate or region controls JC
 	}
+	{
+		RegionInfo2		Single
+		{	ProductSKU			Variable 1	}	// string
+		{	ProductName			Variable 1	}	// string
+		{	MaxAgents32			U32			}	// Identical to RegionInfo.MaxAgents but allows greater range
+		{	HardMaxAgents		U32			}
+		{	HardMaxObjects		U32			}
+	}
 }
 
 // GodUpdateRegionInfo
@@ -3059,6 +3067,14 @@ version 2.0
 		RegionInfo2	Single
 		{	RegionID		LLUUID	}
 	}
+	{
+		RegionInfo3	Single
+		{	CPUClassID				S32		}
+		{	CPURatio				S32		}
+		{	ColoName				Variable	1	}	// string
+		{	ProductSKU				Variable	1	}	// string
+		{	ProductName				Variable	1	}	// string
+	}
 }
 
 // RegionHandshakeReply
@@ -8854,3 +8870,39 @@ version 2.0
 	}
 }
 
+
+// This message is sent from viewer -> simulator when the viewer wants
+// to rez an object out of inventory back to its position before it
+// last moved into the inventory
+{
+	RezRestoreToWorld Low 425 NotTrusted Unencoded UDPDeprecated
+	{
+		AgentData		Single
+		{	AgentID		LLUUID  }
+		{	SessionID	LLUUID	}
+	}
+	{
+		InventoryData			Single
+		{	ItemID				LLUUID	}
+		{	FolderID			LLUUID	}
+		{	CreatorID			LLUUID	}	// permissions
+		{	OwnerID				LLUUID	}	// permissions
+		{	GroupID				LLUUID	}	// permissions
+		{	BaseMask			U32	}	// permissions
+		{	OwnerMask			U32	}	// permissions
+		{	GroupMask			U32	}	// permissions
+		{	EveryoneMask		U32	}	// permissions
+		{	NextOwnerMask		U32	}	// permissions
+		{	GroupOwned			BOOL	}	// permissions
+		{	TransactionID		LLUUID	}
+		{	Type				S8	}
+		{	InvType				S8	}
+		{	Flags				U32	}
+		{	SaleType			U8	}
+		{	SalePrice			S32	}
+		{	Name				Variable	1	}
+		{	Description			Variable	1	}
+		{	CreationDate		S32	}
+		{	CRC				U32	}
+	}
+}