From e5057b4747e6a833dde7feb11814bcf8b82fcffc Mon Sep 17 00:00:00 2001
From: Josh Bell <josh@lindenlab.com>
Date: Wed, 21 Nov 2007 02:29:23 +0000
Subject: [PATCH] svn merge -r 73201:74169
svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-5-Server -->
release
---
etc/message.xml | 2 +-
indra/lib/python/uuid.py | 6 +++++-
scripts/messages/message_template.msg | 6 +++++-
3 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/etc/message.xml b/etc/message.xml
index 86c377eb41a..1e6e30ec6c7 100644
--- a/etc/message.xml
+++ b/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>
diff --git a/indra/lib/python/uuid.py b/indra/lib/python/uuid.py
index 75d189ff7e3..48dac84377a 100644
--- a/indra/lib/python/uuid.py
+++ b/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:
diff --git a/scripts/messages/message_template.msg b/scripts/messages/message_template.msg
index 07215180f53..938a30ae53f 100644
--- a/scripts/messages/message_template.msg
+++ b/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
--
GitLab