diff options
| author | Merov Linden <merov@lindenlab.com> | 2014-02-10 20:12:41 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2014-02-10 20:12:41 -0800 |
| commit | 5c82aca9104ab7b6c7cf59d270ada25053f962cd (patch) | |
| tree | 8ad6ff0d5431f122a30aa622a0a795a8a24e49e2 /indra/lib/python | |
| parent | 67393b8d26a839bf75d2630aca3fc88ee7466768 (diff) | |
| parent | 413be91cf5044889ade97dcbec4b17fceff122e3 (diff) | |
Merge pull from lindenlab/viewer-release
Diffstat (limited to 'indra/lib/python')
| -rwxr-xr-x | indra/lib/python/indra/base/lluuid.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/lib/python/indra/base/lluuid.py b/indra/lib/python/indra/base/lluuid.py index 369ae4e92f..7413ffe10d 100755 --- a/indra/lib/python/indra/base/lluuid.py +++ b/indra/lib/python/indra/base/lluuid.py @@ -72,7 +72,7 @@ class UUID(object): ip = '' try: ip = socket.gethostbyname(socket.gethostname()) - except(socket.gaierror): + except(socket.gaierror, socket.error): # no ip address, so just default to somewhere in 10.x.x.x ip = '10' for i in range(3): |