svn merge -r 73201:74169...

svn merge -r 73201:74169 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-5-Server --> release

etc/message.xml

@@ -255,7 +255,7 @@
 				<key>CoarseLocationUpdate</key>
 				<map>
 				    <key>flavor</key>
-					<string>llsd</string>
+					<string>template</string>
 					<key>trusted-sender</key>
 					<boolean>true</boolean>
 				</map>

indra/lib/python/uuid.py

@@ -277,7 +277,11 @@ def _ifconfig_getnode():
     import os
     for dir in ['', '/sbin/', '/usr/sbin']:
         try:
-            pipe = os.popen(os.path.join(dir, 'ifconfig'))
+            path = os.path.join(dir, 'ifconfig')
+            if os.path.exists(path):
+                pipe = os.popen(path)
+            else:
+                continue
         except IOError:
             continue
         for line in pipe:

scripts/messages/message_template.msg

@@ -3038,7 +3038,7 @@ version 2.0
 // and where someone you are tracking is located. They are -1 if not
 // applicable.
 {
-	CoarseLocationUpdate Medium 6 Trusted Unencoded UDPDeprecated
+	CoarseLocationUpdate Medium 6 Trusted Unencoded
 	{
 		Location	Variable
 		{	X		U8	}
@@ -3050,6 +3050,10 @@ version 2.0
 		{	You		S16	}
 		{	Prey	S16	}
 	}
+    {
+         AgentData       Variable
+         {       AgentID                 LLUUID                  }
+    }
 }
 
 // ImageData - sent to viewer to transmit information about an image