diff options
| author | Merov Linden <merov@lindenlab.com> | 2014-02-24 13:23:39 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2014-02-24 13:23:39 -0800 |
| commit | 245de340d72d0a836cc7525cf8143c232b00235b (patch) | |
| tree | 1436dbf2dfac1deecee4a2ded9a891b7bf68bfb5 /indra/lib | |
| parent | e6efb8f297fa21d76876f391f57d8abdd065584a (diff) | |
| parent | de8fea13627cc5978b8a6135802a52864a11c39a (diff) | |
Pull merge from viewer-release
Diffstat (limited to 'indra/lib')
| -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): |