summaryrefslogtreecommitdiff
path: root/indra/llmessage/message.cpp
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2015-08-18 17:11:08 -0400
committerNat Goodspeed <nat@lindenlab.com>2015-08-18 17:11:08 -0400
commit78c71eba60b7eb6de0a6e277c390f6586cfb0cf6 (patch)
tree98f00d83c842653b46207907ddd6c069479a29b5 /indra/llmessage/message.cpp
parent05d90b56797221ef8d52099722c467a9422c7ce6 (diff)
parent62527e6f18f0a035a234cf584e31f7eea93fd4a7 (diff)
Automated merge with ssh://bitbucket.org/rider_linden/maint-4952-v-t-u
Diffstat (limited to 'indra/llmessage/message.cpp')
-rwxr-xr-xindra/llmessage/message.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llmessage/message.cpp b/indra/llmessage/message.cpp
index feb756a0c7..6712171418 100755
--- a/indra/llmessage/message.cpp
+++ b/indra/llmessage/message.cpp
@@ -1675,7 +1675,7 @@ LLHost LLMessageSystem::findHost(const U32 circuit_code)
}
else
{
- return LLHost::invalid;
+ return LLHost();
}
}