Merge remote branch 'mccabe/1.2.0-next' into next

Moved "Backup" pie menu item to fit "Go Here" in top-left slot.

Conflicts:
	linden/indra/newview/llviewermenu.cpp
	linden/indra/newview/skins/default/xui/en-us/menu_pie_object.xml

1 files changed, 7 insertions, 3 deletions

diff --git a/linden/scripts/messages/message_template.msg b/linden/scripts/messages/message_template.msg
index 6d90622..4a16cf8 100644
--- a/linden/scripts/messages/message_template.msg
+++ b/linden/scripts/messages/message_template.msg
@@ -594,7 +594,7 @@ version 2.0
 // global x,y,z.  Otherwise, use center of the AABB.
 // reliable
 {
-        PlacesReply Low 30 Trusted Zerocoded
+        PlacesReply Low 30 Trusted Zerocoded UDPDeprecated
         {
                 AgentData               Single
                 {       AgentID         LLUUID          }
@@ -1036,7 +1036,7 @@ version 2.0
 // dataserver -> simulator -> viewer
 // reliable
 {
-        DirLandReply Low 50 Trusted Zerocoded
+        DirLandReply Low 50 Trusted Zerocoded UDPDeprecated
         {
                 AgentData                       Single
                 {       AgentID                 LLUUID  }
@@ -2589,6 +2589,10 @@ version 2.0
                 {       East                    F32             }
                 {       North                   F32             }
         }
+        {
+                ModifyBlockExtended Variable
+                {   BrushSize       F32 }
+        }
 }
 
 
@@ -8717,7 +8721,7 @@ version 2.0
 
 // spaceserver -> simulator
 {
-        RpcScriptRequestInboundForward Low 416 Trusted Unencoded
+        RpcScriptRequestInboundForward Low 416 Trusted Unencoded UDPDeprecated
         {
                 DataBlock Single
                 {       RPCServerIP     IPADDR }