69ca6cd5b2
Conflicts: indra/llmessage/llcurl.cpp indra/llmessage/llcurl.h indra/newview/app_settings/settings.xml indra/newview/llappviewer.cpp indra/newview/llmeshrepository.cpp Resolved: indra/llmessage/llcurl.cpp: Basically removed (not used anyway) indra/llmessage/llcurl.h: Basically removed (just includes aiculr.h now) indra/newview/app_settings/settings.xml: CurlUseMultipleThreads was remvoved. CurlMaximumNumberOfHandles and CurlRequestTimeOut are still in there, but unused at the moment. indra/newview/llappviewer.cpp: CurlMaximumNumberOfHandles and CurlRequestTimeOut are unused at the moment. indra/newview/llmeshrepository.cpp: Lock mSignal always (is unlocked inside wait()). Use mSignal lock to see if we are waiting; remove mWaiting. Return false from the MeshFetch functions iff we have to retry a HTTP fetch. Catch the error exception thrown by getByteRange instead of using it's return value (always returns true anyway).
68 lines
2.1 KiB
C++
68 lines
2.1 KiB
C++
/**
|
|
* @file llagentlanguage.cpp
|
|
* @brief Transmit language information to server
|
|
*
|
|
* $LicenseInfo:firstyear=2006&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$
|
|
*/
|
|
|
|
#include "llviewerprecompiledheaders.h"
|
|
#include "llagentlanguage.h"
|
|
// viewer includes
|
|
#include "llagent.h"
|
|
#include "llviewercontrol.h"
|
|
#include "llviewerregion.h"
|
|
// library includes
|
|
#include "llui.h" // getLanguage()
|
|
|
|
LLAgentLanguage::LLAgentLanguage()
|
|
{
|
|
gSavedSettings.getControl("Language")->getSignal()->connect(boost::bind(&update));
|
|
gSavedSettings.getControl("InstallLanguage")->getSignal()->connect(boost::bind(&update));
|
|
gSavedSettings.getControl("SystemLanguage")->getSignal()->connect(boost::bind(&update));
|
|
gSavedSettings.getControl("LanguageIsPublic")->getSignal()->connect(boost::bind(&update));
|
|
}
|
|
|
|
|
|
// send language settings to the sim
|
|
// static
|
|
bool LLAgentLanguage::update()
|
|
{
|
|
LLSD body;
|
|
std::string url;
|
|
|
|
if (gAgent.getRegion())
|
|
{
|
|
url = gAgent.getRegion()->getCapability("UpdateAgentLanguage");
|
|
}
|
|
|
|
if (!url.empty())
|
|
{
|
|
std::string language = LLUI::getLanguage();
|
|
|
|
body["language"] = language;
|
|
body["language_is_public"] = gSavedSettings.getBOOL("LanguageIsPublic");
|
|
|
|
LLHTTPClient::post(url, body, new LLHTTPClient::ResponderIgnore);
|
|
}
|
|
return true;
|
|
}
|