diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-05-22 20:51:58 +0300 | 
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-22 20:51:58 +0300 | 
| commit | 6cc7dd09d5e69cf57e6de7fb568a0ad2693f9c9a (patch) | |
| tree | fab23811a5cedc1ebf01479c852ee92ff62b636c /indra/llmessage/lltemplatemessagedispatcher.cpp | |
| parent | ef8f4819822288e044ea719feb6af7a1f4df4c4e (diff) | |
| parent | 7bb5afc11ee5a6af78302a8d76a9a619e2baaab2 (diff) | |
Merge pull request #1545 from Ansariel/DRTVWR-600-maint-A
Merge main into DRTVWR-600-maint-a
Diffstat (limited to 'indra/llmessage/lltemplatemessagedispatcher.cpp')
| -rw-r--r-- | indra/llmessage/lltemplatemessagedispatcher.cpp | 48 | 
1 files changed, 24 insertions, 24 deletions
diff --git a/indra/llmessage/lltemplatemessagedispatcher.cpp b/indra/llmessage/lltemplatemessagedispatcher.cpp index ee7a4e7e71..267c201705 100644 --- a/indra/llmessage/lltemplatemessagedispatcher.cpp +++ b/indra/llmessage/lltemplatemessagedispatcher.cpp @@ -5,21 +5,21 @@   * $LicenseInfo:firstyear=2009&license=viewerlgpl$   * Second Life Viewer Source Code   * Copyright (C) 2010, Linden Research, Inc. - *  + *   * This library is free software; you can redistribute it and/or   * modify it under the terms of the GNU Lesser General Public   * License as published by the Free Software Foundation;   * version 2.1 of the License only. - *  + *   * This library is distributed in the hope that it will be useful,   * but WITHOUT ANY WARRANTY; without even the implied warranty of   * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU   * Lesser General Public License for more details. - *  + *   * You should have received a copy of the GNU Lesser General Public   * License along with this library; if not, write to the Free Software   * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA - *  + *   * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA   * $/LicenseInfo$   */ @@ -35,33 +35,33 @@  LLTemplateMessageDispatcher::LLTemplateMessageDispatcher(LLTemplateMessageReader &template_message_reader) : -	mTemplateMessageReader(template_message_reader) +    mTemplateMessageReader(template_message_reader)  {  }  void LLTemplateMessageDispatcher::dispatch(const std::string& msg_name, -										   const LLSD& message, -										   LLHTTPNode::ResponsePtr responsep) +                                           const LLSD& message, +                                           LLHTTPNode::ResponsePtr responsep)  { -	std::vector<U8> data = message["body"]["binary-template-data"].asBinary(); -	U32 size = data.size(); -	if(size == 0) -	{ -		return; -	} +    std::vector<U8> data = message["body"]["binary-template-data"].asBinary(); +    U32 size = data.size(); +    if(size == 0) +    { +        return; +    } -	LLHost host; -	host = gMessageSystem->getSender(); +    LLHost host; +    host = gMessageSystem->getSender(); -	bool validate_message = mTemplateMessageReader.validateMessage(&(data[0]), data.size(), host, true); +    bool validate_message = mTemplateMessageReader.validateMessage(&(data[0]), data.size(), host, true); -	if (validate_message) -	{ -		mTemplateMessageReader.readMessage(&(data[0]),host); -	}  -	else  -	{ -		gMessageSystem->clearReceiveState(); -	} +    if (validate_message) +    { +        mTemplateMessageReader.readMessage(&(data[0]),host); +    } +    else +    { +        gMessageSystem->clearReceiveState(); +    }  }  | 
