diff options
| author | Rider Linden <rider@lindenlab.com> | 2015-08-24 14:19:30 -0700 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2015-08-24 14:19:30 -0700 |
| commit | 7c61728b4bae928b2461f0f933dd1c1fa34ef0aa (patch) | |
| tree | dc43fab3897d0a9b7ae4d4f0625db24596a7ffc5 /indra/llmessage | |
| parent | 7d2ed8e60668a69e97c58072377273e035022cd2 (diff) | |
MAINT-4952: Removed a bit of debug code that got included accidentally and change host == LLHost() to host.isInvalid()
Diffstat (limited to 'indra/llmessage')
| -rwxr-xr-x | indra/llmessage/llhost.h | 3 | ||||
| -rwxr-xr-x | indra/llmessage/message.cpp | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/indra/llmessage/llhost.h b/indra/llmessage/llhost.h index 376371cffd..79cad4b123 100755 --- a/indra/llmessage/llhost.h +++ b/indra/llmessage/llhost.h @@ -88,7 +88,8 @@ public: // READERS U32 getAddress() const { return mIP; } U32 getPort() const { return mPort; } - BOOL isOk() const { return (mIP != INVALID_HOST_IP_ADDRESS) && (mPort != INVALID_PORT); } + bool isOk() const { return (mIP != INVALID_HOST_IP_ADDRESS) && (mPort != INVALID_PORT); } + bool isInvalid() { return (mIP == INVALID_HOST_IP_ADDRESS) || (mPort == INVALID_PORT); } size_t hash() const { return (mIP << 16) | (mPort & 0xffff); } std::string getString() const; std::string getIPString() const; diff --git a/indra/llmessage/message.cpp b/indra/llmessage/message.cpp index 6712171418..10dbbef046 100755 --- a/indra/llmessage/message.cpp +++ b/indra/llmessage/message.cpp @@ -1151,8 +1151,7 @@ S32 LLMessageSystem::sendMessage(const LLHost &host) } // NOTE: babbage: LLSD message -> HTTP, template message -> UDP -// if(mMessageBuilder == mLLSDMessageBuilder) - if (!host.getUntrustedSimulatorCap().empty()) + if(mMessageBuilder == mLLSDMessageBuilder) { LLSD message = mLLSDMessageBuilder->getMessage(); |