diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2015-08-18 17:11:08 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2015-08-18 17:11:08 -0400 |
| commit | 78c71eba60b7eb6de0a6e277c390f6586cfb0cf6 (patch) | |
| tree | 98f00d83c842653b46207907ddd6c069479a29b5 /indra/newview/llagent.cpp | |
| parent | 05d90b56797221ef8d52099722c467a9422c7ce6 (diff) | |
| parent | 62527e6f18f0a035a234cf584e31f7eea93fd4a7 (diff) | |
Automated merge with ssh://bitbucket.org/rider_linden/maint-4952-v-t-u
Diffstat (limited to 'indra/newview/llagent.cpp')
| -rwxr-xr-x | indra/newview/llagent.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp index 7147769c43..e7dd378edd 100755 --- a/indra/newview/llagent.cpp +++ b/indra/newview/llagent.cpp @@ -930,7 +930,7 @@ LLHost LLAgent::getRegionHost() const } else { - return LLHost::invalid; + return LLHost(); } } |